Index: skinr.skinr.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/skinr.skinr.inc,v
retrieving revision 1.2
diff -u -p -r1.2 skinr.skinr.inc
--- skinr.skinr.inc	29 Jan 2011 01:43:59 -0000	1.2
+++ skinr.skinr.inc	29 Jan 2011 02:27:32 -0000
@@ -39,18 +39,6 @@ function skinr_skinr_group_info() {
  * Implementation of hook_skinr_config_info().
  */
 function skinr_skinr_config_info() {
-  $data['rules']['form']['skinr_rule_edit'] = array(
-    'index_handler' => 'rules_skinr_form_index_handler',
-    'preprocess_hook_callback' => 'rules_skinr_preprocess_hook_callback',
-    'title' => t('rule settings'),
-    'skinr_weight' => 0,
-    'collapsed' => FALSE,
-  );
-  $data['rules']['form']['skinr_ui_form'] = array(
-    'preprocess_hook_callback' => 'rules_skinr_preprocess_hook_callback',
-    'title' => t('rule settings'),
-    'collapsed' => FALSE,
-  );
   $data['rules']['preprocess']['html'] = array(
     'index_handler' => 'rules_skinr_preprocess_index_handler',
   );
@@ -68,37 +56,6 @@ function skinr_skinr_config_info() {
 }
 
 /**
- * Skinr form index handler.
- *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - 'form': the form elements for Skinr are being inserted in a form.
- *   - 'submit': the form has been submitted.
- * @param &$form
- *   - For 'form', passes in the $form parameter from hook_form_alter().
- *   - For 'submit', passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   - For 'form', passes in the $form_state parameter from hook_form_alter().
- *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
- * @return
- *   The index where we can find our values in Skinr's data structure.
- */
-function rules_skinr_form_index_handler($op, &$form, $form_state) {
-  switch ($op) {
-    case 'form':
-      if (!empty($form['rule']['rid']['#value'])) {
-        return $form['rule']['rid']['#value'];
-      }
-      else {
-        return 0;
-      }
-
-    case 'submit':
-      return $form_state['values']['rid'];
-  }
-}
-
-/**
  * Skinr preprocess_hook_callback.
  *
  * @param &$form
Index: skinr_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/skinr_ui.module,v
retrieving revision 1.25
diff -u -p -r1.25 skinr_ui.module
--- skinr_ui.module	28 Jan 2011 19:35:29 -0000	1.25
+++ skinr_ui.module	29 Jan 2011 02:26:47 -0000
@@ -354,283 +354,6 @@ function skinr_ui_form($form, &$form_sta
 }
 
 /**
- * Implements hook_form_alter().
- */
-function skinr_ui_form_alter(&$form, $form_state, $form_id) {
-  // Fix for update script.
-  if ($form_id == 'update_script_selection_form') {
-    return;
-  }
-
-  $config = skinr_get_config_info();
-  $skin_infos = skinr_get_skin_info();
-  $groups = skinr_get_group_info();
-
-  foreach ($config as $module => $module_settings) {
-    if (isset($module_settings['form'][$form_id])) {
-      if (!empty($form['skinr']) && $form['skinr']['module']['#value'] !== $module) {
-        continue;
-      }
-
-      $form_settings = array_merge(skinr_config_info_default(), $module_settings['form'][$form_id]);
-
-      // Check for access.
-      if (!skinr_handler('access_handler', 'edit skin settings', $form_settings['access_handler'], $form, $form_state)) {
-        // Deny access.
-        break;
-      }
-
-      // Ensure we have the required preprocess_hook or preprocess_hook_callback.
-      if (empty($form_settings['preprocess_hook']) && empty($form_settings['preprocess_hook_callback'])) {
-        trigger_error(sprintf("No preprocess_hook or preprocess_hook_callback was found for form_id '%s' in module '%s'.", $form_id, $module), E_USER_ERROR);
-      }
-
-      $themes = list_themes();
-      ksort($themes);
-
-      foreach ($themes as $theme) {
-        if (!$theme->status) {
-          continue;
-        }
-
-        if (!isset($form['skinr_settings'])) {
-          $form['skinr_settings'] = array(
-            '#tree' => TRUE,
-            '#weight' => $form_settings['skinr_weight'],
-          );
-        }
-
-        $preprocess_hooks = isset($form_settings['preprocess_hook']) ? $form_settings['preprocess_hook'] : skinr_handler('preprocess_hook_callback', '', $form_settings['preprocess_hook_callback'], $form, $form_state);
-        if (!is_array($preprocess_hooks)) {
-          $preprocess_hooks = array($preprocess_hooks);
-        }
-
-        // If this hook is a region, and the region does not exist for this
-        // theme, don't bother outputting any of the settings.
-        if (strpos($preprocess_hooks[0], 'region') === 0) {
-          // Strip the region__ part off the region name.
-          $region = substr($preprocess_hooks[0], 8);
-
-          $regions = system_region_list($theme->name, REGIONS_VISIBLE);
-          if (!isset($regions[$region])) {
-            continue;
-          }
-        }
-
-        if (!$form_state['submitted']) {
-          if ($skin = skinr_handler('data_handler', 'form', $form_settings['data_handler'], $form, $form_state, $theme->name, $module, $form_settings)) {
-            $defaults  = $skin->skins['_options'];
-            $additional_default = isset($skin->skins['_additional']) ? $skin->skins['_additional'] : '';
-          }
-          else {
-            $defaults  = array();
-            $additional_default = '';
-          }
-        }
-        else {
-          // Handle preview before submit.
-          $defaults  = $form_state['values']['widgets'];
-          $additional_default = $form_state['values']['_additional'];
-        }
-
-        if (!isset($form['skinr_settings'][$module . '_group'])) {
-          $form['skinr_settings'][$module . '_group'] = array(
-            '#type' => 'fieldset',
-            '#title' => t('@skinr_title @title', array('@skinr_title' => $form_settings['skinr_title'], '@title' => $form_settings['title'])),
-            '#description' => t($form_settings['description']) . ' <strong>' . implode(', ', $preprocess_hooks) . '</strong>.',
-            '#weight' => $form_settings['weight'],
-            '#collapsible' => TRUE,
-            '#collapsed' => $form_settings['collapsed'],
-          );
-        }
-
-        // Get current theme, but make sure it's not the admin theme when we're editing with AJAX.
-        $current_theme = skinr_current_theme(TRUE);
-
-        $form['skinr_settings'][$module . '_group'][$theme->name] = array(
-          '#type' => 'fieldset',
-          '#title' => $theme->info['name'] . ($theme->name == $current_theme ? ' (' . t('enabled + default') . ')' : ''),
-          '#collapsible' => TRUE,
-          '#collapsed' => $theme->name == $current_theme ? FALSE : TRUE,
-        );
-        if ($theme->name == $current_theme) {
-          $form['skinr_settings'][$module . '_group'][$theme->name]['#attributes'] = array('class' => array('skinr-ui-current-theme'));
-          $form['skinr_settings'][$module . '_group'][$theme->name]['#weight'] = -10;
-        }
-
-        // Create individual widgets for each skin.
-        foreach ($skin_infos as $skin_name => $skin_info) {
-          // Check if this skin is disabled.
-          if (empty($skin_info['status'][$theme->name])) {
-            continue;
-          }
-
-          // Check if this skin applies to this hook.
-          if (!is_array($skin_info['theme hooks']) || (!in_array('*', $skin_info['theme hooks']) && !_skinr_is_featured($preprocess_hooks, $skin_info['theme hooks']))) {
-            continue;
-          }
-
-          // Create widget.
-          if (!empty($skin_info['form callback']) && function_exists($skin_info['form callback'])) {
-            // @todo Allow for custom form callbacks.
-            $field = array();
-          }
-          else {
-            switch ($skin_info['type']) {
-              case 'checkboxes':
-                $field = array(
-                  '#type' => 'checkboxes',
-                  '#multiple' => TRUE,
-                  '#title' => t($skin_info['title']),
-                  '#options' => skinr_ui_info_options_to_form_options($skin_info['options']),
-                  '#default_value' => isset($defaults[$skin_name]) ? $defaults[$skin_name] : array(),
-                  '#description' => t($skin_info['description']),
-                  '#weight' => isset($skin_info['weight']) ? $skin_info['weight'] : NULL,
-                );
-                break;
-              case 'radios':
-                $field = array(
-                  '#type' => 'radios',
-                  '#title' => t($skin_info['title']),
-                  '#options' => array_merge(array('' => '&lt;none&gt;'), skinr_ui_info_options_to_form_options($skin_info['options'])),
-                  '#default_value' => isset($defaults[$skin_name]) ? $defaults[$skin_name] : '',
-                  '#description' => t($skin_info['description']),
-                  '#weight' => isset($skin_info['weight']) ? $skin_info['weight'] : NULL,
-                );
-                break;
-              case 'select':
-                $field = array(
-                  '#type' => 'select',
-                  '#title' => t($skin_info['title']),
-                  '#options' => array_merge(array('' => '<none>'), skinr_ui_info_options_to_form_options($skin_info['options'])),
-                  '#default_value' => isset($defaults[$skin_name]) ? $defaults[$skin_name] : '',
-                  '#description' => t($skin_info['description']),
-                  '#weight' => isset($skin_info['weight']) ? $skin_info['weight'] : NULL,
-                );
-                break;
-            }
-          }
-          if (empty($skin_info['group']) || empty($groups[$skin_info['group']])) {
-            $form['skinr_settings'][$module . '_group'][$theme->name]['widgets'][$skin_name] = $field;
-          }
-          else {
-            if (!isset($form['skinr_settings'][$module . '_group'][$theme->name]['widgets'][$skin_info['group']])) {
-              $group = $groups[$skin_info['group']];
-              $form['skinr_settings'][$module . '_group'][$theme->name]['widgets'][$skin_info['group']] = array(
-                '#type' => 'fieldset',
-                '#title' => t($group['title']),
-                '#description' => t($group['description']),
-                '#weight' => isset($group['weight']) ? $group['weight'] : NULL,
-              );
-            }
-            $form['skinr_settings'][$module . '_group'][$theme->name]['widgets'][$skin_info['group']][$skin_name] = $field;
-          }
-        }
-
-        // Check for access.
-        if (skinr_handler('access_handler', 'edit advanced skin settings', $form_settings['access_handler'], $form, $form_state)) {
-          $form['skinr_settings'][$module . '_group'][$theme->name]['_additional'] = array(
-            '#type' => 'textfield',
-            '#title' => t('CSS classes'),
-            '#size' => 40,
-            '#description' => t('To add CSS classes manually, enter classes separated by a single space i.e. <code>first-class second-class</code>'),
-            '#default_value' => $additional_default,
-          );
-
-          // Only add validation handler once.
-          if (!isset($form['#validate']) || !in_array('skinr_ui_form_validate', $form['#validate'])) {
-            $form['#validate'][] = 'skinr_ui_form_validate';
-          }
-          // Special for views.
-          if (isset($form['buttons']['submit']['#validate']) && !in_array('skinr_ui_form_validate', $form['buttons']['submit']['#validate'])) {
-            $form['buttons']['submit']['#validate'][] = 'skinr_ui_form_validate';
-          }
-        }
-      }
-
-      // Add weight to additional settings and submit form elements.
-      $form['additional_settings']['#weight'] = 39;
-      $form['submit']['#weight'] = 40;
-
-      // Only add submit handler once.
-      // Find the property to check.
-      $attr = &$form;
-      foreach($form_settings['submit_handler_attach_to'] as $part) {
-        $attr = &$attr[$part];
-      }
-      if (!empty($attr) && !in_array('skinr_ui_form_submit', $attr)) {
-        $string = $attr[] = 'skinr_ui_form_submit';
-      }
-
-      // Keep looping, there might be other modules that implement the same form_id.
-    }
-  }
-}
-
-/**
- * Form validation handler for skinr_ui_form_alter().
- */
-function skinr_ui_form_validate($form, &$form_state) {
-  $form_id = $form_state['values']['form_id'];
-  $config = skinr_get_config_info();
-
-  $error = FALSE;
-  foreach ($config as $module => $module_settings) {
-    if (isset($module_settings['form'][$form_id]) && isset($form_state['values']['skinr_settings'][$module . '_group'])) {
-      foreach ($form_state['values']['skinr_settings'][$module . '_group'] as $theme_name => $theme) {
-        if (isset($theme['_additional'])) {
-          $form_settings = array_merge(skinr_config_info_default(), $module_settings['form'][$form_id]);
-
-          // Validate additional classes field.
-          if (preg_match('/[^a-zA-Z0-9\-\_\s]/', $theme['_additional'])) {
-            form_set_error('skinr_settings][' . $module . '_group][' . $theme_name . '][_additional', t('Additional classes for Skinr may only contain alphanumeric characters, spaces, - and _.'));
-            $error = TRUE;
-          }
-
-          // Keep looping, there might be other modules that implement the same form_id.
-        }
-      }
-    }
-  }
-
-  // Undo any grouping to ease processing on submit.
-  if (!$error) {
-    $groups = skinr_get_group_info();
-    foreach ($config as $module => $module_settings) {
-      if (isset($module_settings['form'][$form_id]) && isset($form_state['values']['skinr_settings'][$module . '_group'])) {
-        foreach ($form_state['values']['skinr_settings'][$module . '_group'] as $theme_name => $theme) {
-          foreach ($groups as $group_name => $group) {
-            if (!empty($theme['widgets'][$group_name]) && is_array($theme['widgets'][$group_name])) {
-              $group_values = $theme['widgets'][$group_name];
-              unset($form_state['values']['skinr_settings'][$module . '_group'][$theme_name]['widgets'][$group_name]);
-              $form_state['values']['skinr_settings'][$module . '_group'][$theme_name]['widgets'] = array_merge($form_state['values']['skinr_settings'][$module . '_group'][$theme_name]['widgets'], $group_values);
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-/**
- * Form submission handler for skinr_ui_form_alter().
- */
-function skinr_ui_form_submit($form, &$form_state) {
-  $form_id = $form_state['values']['form_id'];
-  $config = skinr_get_config_info();
-  $current_theme = skinr_current_theme(TRUE);
-
-  foreach ($config as $module => $module_settings) {
-    if (isset($module_settings['form'][$form_id])) {
-      $form_settings = array_merge(skinr_config_info_default(), $module_settings['form'][$form_id]);
-      skinr_handler('submit_handler', '', $form_settings['submit_handler'], $form, $form_state, $module, $form_settings);
-
-      // Keep looping, there might be other modules that implement the same form_id.
-    }
-  }
-}
-
-/**
  * Implements hook_preprocess().
  */
 function skinr_ui_preprocess(&$variables, $hook) {
Index: modules/block.skinr.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/block.skinr.inc,v
retrieving revision 1.14
diff -u -p -r1.14 block.skinr.inc
--- modules/block.skinr.inc	27 Nov 2010 23:22:27 -0000	1.14
+++ modules/block.skinr.inc	29 Jan 2011 02:17:30 -0000
@@ -15,25 +15,6 @@
  * Implements hook_skinr_config_info().
  */
 function block_skinr_config_info() {
-  $data['block']['form']['block_admin_configure'] = array(
-    'index_handler' => 'block_skinr_form_index_handler',
-    'preprocess_hook_callback' => 'block_skinr_preprocess_hook_callback',
-    'title' => t('block settings'),
-    'skinr_weight' => 0,
-    'collapsed' => FALSE,
-  );
-  $data['block']['form']['block_add_block_form'] = array(
-    'index_handler' => 'block_skinr_form_index_handler',
-    'preprocess_hook_callback' => 'block_skinr_preprocess_hook_callback',
-    'title' => t('block settings'),
-    'skinr_weight' => 0,
-    'collapsed' => FALSE,
-  );
-  $data['block']['form']['skinr_ui_form'] = array(
-    'preprocess_hook_callback' => 'block_skinr_preprocess_hook_callback',
-    'title' => t('block settings'),
-    'collapsed' => FALSE,
-  );
   $data['block']['preprocess']['block'] = array(
     'index_handler' => 'block_skinr_preprocess_index_handler',
   );
@@ -45,33 +26,6 @@ function block_skinr_config_info() {
 }
 
 /**
- * Skinr form index handler.
- *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - 'form': the form elements for Skinr are being inserted in a form.
- *   - 'submit': the form has been submitted.
- * @param &$form
- *   - For 'form', passes in the $form parameter from hook_form_alter().
- *   - For 'submit', passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   - For 'form', passes in the $form_state parameter from hook_form_alter().
- *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
- *
- * @return
- *   The index where we can find our values in Skinr's data structure.
- */
-function block_skinr_form_index_handler($op, &$form, $form_state) {
-  switch ($op) {
-    case 'form':
-      return $form['module']['#value'] . '-' . $form['delta']['#value'];
-
-    case 'submit':
-      return $form_state['values']['module'] . '-' . $form_state['values']['delta'];
-  }
-}
-
-/**
  * Skinr preprocess hook callback.
  *
  * @param &$form
Index: modules/comment.skinr.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/comment.skinr.inc,v
retrieving revision 1.11
diff -u -p -r1.11 comment.skinr.inc
--- modules/comment.skinr.inc	27 Nov 2010 23:22:27 -0000	1.11
+++ modules/comment.skinr.inc	29 Jan 2011 02:19:01 -0000
@@ -15,18 +15,6 @@
  * Implements hook_skinr_config_info().
  */
 function comment_skinr_config_info() {
-  $data['comment']['form']['node_type_form'] = array(
-    'index_handler' => 'comment_skinr_form_index_handler',
-    'preprocess_hook_callback' => 'comment_skinr_preprocess_hook_callback',
-    'title' => t('comment settings'),
-    'weight' => 1,
-  );
-  $data['comment']['form']['skinr_ui_form'] = array(
-    'preprocess_hook_callback' => 'comment_skinr_preprocess_hook_callback',
-    'title' => t('comment settings'),
-    'skinr_weight' => 2,
-    'collapsed' => FALSE,
-  );
   $data['comment']['preprocess']['comment_wrapper'] = array(
     'index_handler' => 'comment_skinr_preprocess_index_handler',
   );
@@ -38,45 +26,6 @@ function comment_skinr_config_info() {
 }
 
 /**
- * Skinr form index handler.
- *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - 'form': the form elements for Skinr are being inserted in a form.
- *   - 'submit': the form has been submitted.
- * @param &$form
- *   - For 'form', passes in the $form parameter from hook_form_alter().
- *   - For 'submit', passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   - For 'form', passes in the $form_state parameter from hook_form_alter().
- *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
- *
- * @return
- *   The index where we can find our values in Skinr's data structure.
- */
-function comment_skinr_form_index_handler($op, &$form, &$form_state) {
-  switch ($op) {
-    case 'form':
-      return $form['#node_type']->type;
-
-    case 'submit':
-      // Clear old variable before we set a new one if the node type has changed
-      if ($form_state['values']['old_type'] != $form_state['values']['type']) {
-        foreach ($form_state['values']['skinr_settings']['comment_group'] as $theme_name => $theme_data) {
-          $skinr = new stdClass();
-          $skinr->theme = $theme_name;
-          $skinr->module = 'comment';
-          $skinr->sid = $form_state['values']['old_type'];
-          $skinr->skins = array();
-
-          skinr_skin_save($skinr);
-        }
-      }
-    return $form_state['values']['type'];
-  }
-}
-
-/**
  * Skinr preprocess hook callback.
  *
  * @param &$form
Index: modules/node.skinr.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/node.skinr.inc,v
retrieving revision 1.11
diff -u -p -r1.11 node.skinr.inc
--- modules/node.skinr.inc	27 Nov 2010 23:22:27 -0000	1.11
+++ modules/node.skinr.inc	29 Jan 2011 02:19:22 -0000
@@ -15,16 +15,6 @@
  * Implements hook_skinr_config_info().
  */
 function node_skinr_config_info() {
-  $data['node']['form']['node_type_form'] = array(
-    'index_handler' => 'node_skinr_form_index_handler',
-    'preprocess_hook_callback' => 'node_skinr_preprocess_hook_callback',
-    'title' => t('node settings'),
-  );
-  $data['node']['form']['skinr_ui_form'] = array(
-    'preprocess_hook_callback' => 'node_skinr_preprocess_hook_callback',
-    'title' => t('node settings'),
-    'collapsed' => FALSE,
-  );
   $data['node']['preprocess']['node'] = array(
     'index_handler' => 'node_skinr_preprocess_index_handler',
   );
@@ -36,45 +26,6 @@ function node_skinr_config_info() {
 }
 
 /**
- * Skinr form index handler.
- *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - 'form': the form elements for Skinr are being inserted in a form.
- *   - 'submit': the form has been submitted.
- * @param &$form
- *   - For 'form', passes in the $form parameter from hook_form_alter().
- *   - For 'submit', passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   - For 'form', passes in the $form_state parameter from hook_form_alter().
- *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
- *
- * @return
- *   The index where we can find our values in Skinr's data structure.
- */
-function node_skinr_form_index_handler($op, &$form, $form_state) {
-  switch ($op) {
-    case 'form':
-      return $form['#node_type']->type;
-
-    case 'submit':
-      // Clear old variable before we set a new one if the node type has changed.
-      if ($form_state['values']['old_type'] != $form_state['values']['type']) {
-        foreach ($form_state['values']['skinr_settings']['node_group'] as $theme_name => $theme_data) {
-          $skinr = new stdClass();
-          $skinr->theme = $theme_name;
-          $skinr->module = 'node';
-          $skinr->sid = $form_state['values']['old_type'];
-          $skinr->skins = array();
-
-          skinr_skin_save($skinr);
-        }
-      }
-    return $form_state['values']['type'];
-  }
-}
-
-/**
  * Skinr preprocess hook callback.
  *
  * @param &$form
Index: modules/panels.skinr.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/panels.skinr.inc,v
retrieving revision 1.19
diff -u -p -r1.19 panels.skinr.inc
--- modules/panels.skinr.inc	20 Dec 2010 21:42:29 -0000	1.19
+++ modules/panels.skinr.inc	29 Jan 2011 02:21:23 -0000
@@ -15,36 +15,6 @@
  * Implements hook_skinr_config_info().
  */
 function panels_skinr_config_info() {
-  $data['panels']['form']['panels_edit_style_settings_form'] = array(
-    'index_handler' => 'panels_skinr_form_index_handler',
-    'data_handler' => 'panels_skinr_data_handler',
-    'submit_handler' => 'panels_skinr_submit_handler_settings',
-    'preprocess_hook_callback' => 'panels_skinr_preprocess_hook_callback',
-    'title' => t('panel pane settings'),
-    'skinr_weight' => 0,
-    'collapsed' => FALSE,
-  );
-  // AJAX form.
-  $data['panels']['form']['skinr_ui_form'] = array(
-    'preprocess_hook_callback' => 'panels_skinr_ajax_preprocess_hook_callback',
-    'title' => t('panel pane settings'),
-    'collapsed' => FALSE,
-  );
-  // Panel pages.
-  $data['panels']['form']['page_manager_save_page_form'] = array(
-    'access_handler' => 'panels_skinr_access_handler_display',
-    'submit_handler' => 'panels_skinr_submit_handler_display',
-  );
-  // Content form for panel pages.
-  $data['panels']['form']['panels_panel_context_edit_content'] = array(
-    'access_handler' => 'panels_skinr_access_handler_display',
-    'submit_handler' => 'panels_skinr_submit_handler_display',
-  );
-  // Mini panels.
-  $data['panels']['form']['panels_edit_display_form'] = array(
-    'access_handler' => 'panels_skinr_access_handler_display',
-    'submit_handler' => 'panels_skinr_submit_handler_display',
-  );
   $data['panels']['preprocess']['panels_pane'] = array(
     'index_handler' => 'panels_skinr_preprocess_index_handler',
   );
@@ -53,38 +23,6 @@ function panels_skinr_config_info() {
 }
 
 /**
- * Skinr form index handler.
- *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - 'form': the form elements for Skinr are being inserted in a form.
- *   - 'submit': the form has been submitted.
- * @param &$form
- *   - For 'form', passes in the $form parameter from hook_form_alter().
- *   - For 'submit', passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   - For 'form', passes in the $form_state parameter from hook_form_alter().
- *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
- *
- * @return
- *   The index where we can find our values in Skinr's data structure.
- */
-function panels_skinr_form_index_handler($op, &$form, $form_state) {
-  switch ($op) {
-    case 'form':
-    case 'submit':
-      switch ($form_state['type']) {
-        case 'display':
-          return 'display-' . $form_state['display']->did;
-        case 'region':
-          return 'display-' . $form_state['display']->did . '-region-' . $form_state['pid'];
-        case 'pane':
-          return 'display-' . $form_state['display']->did . '-pane-' . $form_state['pid'];
-      }
-  }
-}
-
-/**
  * Skinr access handler.
  *
  * @param $op
@@ -201,131 +139,6 @@ function panels_skinr_data_handler(&$for
 }
 
 /**
- * Skinr submit handler.
- *
- * @param &$form
- *   Passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   Passes in the $form_state parameter from hook_form_submit().
- * @param $module
- *   The module that is currently being processed.
- * @param $form_settings
- *   The settings from hook_skinr_config() for the form that's currently being
- *   processed.
- */
-function panels_skinr_submit_handler_settings(&$form, $form_state, $module, $form_settings) {
-  foreach ($form_state['values']['skinr_settings'][$module . '_group'] as $theme_name => $theme) {
-    if ((!empty($theme['widgets']) && is_array($theme['widgets'])) || isset($theme['_additional'])) {
-      $hook  = $module;
-      $sid   = skinr_handler('form_index_handler', 'submit', $form_settings['index_handler'], $form, $form_state);
-
-      // Key doesn't exist properly for new displays. Perhaps we should inject a timestamp based key into the display object
-      // and use that for reference on the final submit? If it works...
-
-      $value = array();
-
-      if (!empty($theme['widgets']) && is_array($theme['widgets'])) {
-        foreach ($theme['widgets'] as $skin_name => $skin_value) {
-          $value['_options'][$skin_name] = $skin_value;
-        }
-      }
-
-      if (isset($theme['_additional'])) {
-        $theme['_additional'] = trim($theme['_additional']);
-        if (!empty($theme['_additional'])) {
-          $value['_additional'] = $theme['_additional'];
-        }
-      }
-
-      if (empty($sid)) {
-        // We didn't receive a valid sid, so raise an error.
-        drupal_set_message(t("Skinr settings weren't saved due to an error."), 'error');
-      }
-
-      // Save skinr_settings for this panel display in cache.
-      ctools_include('object-cache');
-      if (!$skinr_data = ctools_object_cache_get('skinr', $form_state['display']->did, TRUE)) {
-        $skinr_data = array();
-        // Fetch skinr data.
-        $skinr = skinr_skin_load($theme_name);
-        if (isset($skinr[$module])) {
-          foreach ($skinr[$module] as $skinr_key => $skinr_value) {
-            if (drupal_substr($skinr_key, 0, drupal_strlen('display-' . $form_state['display']->did)) == 'display-' . $form_state['display']->did) {
-              $skinr_data[$theme_name][$skinr_key] = $skinr_value;
-            }
-          }
-        }
-      }
-      $skinr_data[$theme_name][$sid] = $value;
-      ctools_object_cache_set('skinr', $form_state['display']->did, $skinr_data);
-    }
-  }
-}
-
-/**
- * @todo Remove values from skinr if a display is deleted.
- */
-function panels_skinr_submit_handler_display(&$form, $form_state, $module, $form_settings) {
-  $form_id = $form_state['values']['form_id'];
-
-  // Include ctools' object cache files.
-  ctools_include('object-cache');
-
-  if ($form_state['values']['op'] == t('Save') || $form_state['values']['op'] == t('Update and save')) {
-    switch ($form_id) {
-      case 'panels_panel_context_edit_content':
-      case 'page_manager_save_page_form':
-        // Panel page.
-        foreach ($form_state['page']->handler_info as $id => $info) {
-          if ($info['changed']) {
-            _panels_skinr_save_and_clear_cache($form_state['page']->handlers[$id]->conf['did']);
-          }
-        }
-        break;
-
-      case 'panels_edit_display_form':
-        // Mini panels.
-        _panels_skinr_save_and_clear_cache($form_state['display']->did);
-        break;
-    }
-  }
-  elseif ($form_state['values']['op'] == t('Cancel')) {
-    switch ($form_id) {
-      case 'page_manager_save_page_form':
-        // Panel page.
-        foreach ($form_state['page']->handler_info as $id => $info) {
-          if ($info['changed']) {
-            ctools_object_cache_clear('skinr', $form_state['page']->handlers[$id]->conf['did']);
-          }
-        }
-        break;
-
-      case 'panels_edit_display_form':
-        // Mini panels.
-        ctools_object_cache_clear('skinr', $form_state['display']->did);
-        break;
-    }
-  }
-}
-
-function _panels_skinr_save_and_clear_cache($did) {
-  if ($skinr_data = ctools_object_cache_get('skinr', $did, TRUE)) {
-    foreach ($skinr_data as $theme_name => $theme) {
-      foreach ($theme as $sid => $skins) {
-        $skinr = new stdClass();
-        $skinr->theme = $theme_name;
-        $skinr->module = 'panels';
-        $skinr->sid = $sid;
-        $skinr->skins = $skins;
-
-        skinr_skin_save($skinr);
-      }
-    }
-    ctools_object_cache_clear('skinr', $did);
-  }
-}
-
-/**
  * Skinr preprocess hook callback.
  *
  * @param &$form
Index: modules/views.skinr.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/views.skinr.inc,v
retrieving revision 1.15
diff -u -p -r1.15 views.skinr.inc
--- modules/views.skinr.inc	20 Dec 2010 21:42:29 -0000	1.15
+++ modules/views.skinr.inc	29 Jan 2011 02:24:20 -0000
@@ -16,26 +16,6 @@
  * Implements hook_skinr_config_info().
  */
 function views_skinr_config_info() {
-  $data['views']['form']['views_ui_edit_display_form'] = array(
-    'index_handler' => 'views_skinr_form_index_handler',
-    'access_handler' => 'views_skinr_access_handler_display',
-    'data_handler' => 'views_skinr_data_handler',
-    'submit_handler' => 'views_skinr_submit_handler_display',
-    'submit_handler_attach_to' => array('buttons', 'submit', '#submit'),
-    'preprocess_hook_callback' => 'views_skinr_preprocess_hook_callback',
-    'title' => t('views style settings'),
-    'skinr_weight' => 0,
-    'collapsed' => FALSE,
-  );
-  $data['views']['form']['views_ui_edit_view_form'] = array(
-    'access_handler' => 'views_skinr_access_handler_view',
-    'submit_handler' => 'views_skinr_submit_handler_view',
-  );
-  $data['views']['form']['skinr_ui_form'] = array(
-    'preprocess_hook_callback' => 'views_skinr_preprocess_hook_callback',
-    'title' => t('views style settings'),
-    'collapsed' => FALSE,
-  );
   $data['views']['preprocess']['views_view'] = array(
     'index_handler' => 'views_skinr_preprocess_index_handler',
   );
@@ -44,232 +24,6 @@ function views_skinr_config_info() {
 }
 
 /**
- * Skinr form index handler.
- *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - 'form': the form elements for Skinr are being inserted in a form.
- *   - 'submit': the form has been submitted.
- * @param &$form
- *   - For 'form', passes in the $form parameter from hook_form_alter().
- *   - For 'submit', passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   - For 'form', passes in the $form_state parameter from hook_form_alter().
- *   - For 'submit', passes in the $form_state parameter from hook_form_submit().
- *
- * @return
- *   The index where we can find our values in Skinr's data structure.
- */
-function views_skinr_form_index_handler($op, &$form, $form_state) {
-  switch ($op) {
-    case 'form':
-      $default = $form_state['view']->display_handler->is_defaulted('style_options');
-      if ($default) {
-        return 'view-'. $form_state['view']->name .'-display-default';
-      }
-      else {
-        return 'view-'. $form_state['view']->name .'-display-'. $form_state['view']->current_display;
-      }
-
-    case 'submit':
-      // Can't use display_handler->is_defaulted('style_options') on submit
-      $default = ($form_state['#section'] == 'default-style_options');
-      if ($default) {
-        return 'view-'. $form_state['view']->name .'-display-default';
-      }
-      else {
-        return 'view-'. $form_state['view']->name .'-display-'. $form_state['display_id'];
-      }
-  }
-}
-
-/**
- * Skinr access handler.
- *
- * @param $op
- *   What kind of action is being performed. Possible values:
- *   - edit skin settings
- *   - edit advanced skin settings
- * @param &$form
- *   Passes in the $form parameter from hook_form_alter().
- * @param $form_state
- *   Passes in the $form_state parameter from hook_form_alter().
- *
- * @return
- *   TRUE if we get access, FALSE otherwise.
- */
-function views_skinr_access_handler_display($op, &$form, $form_state) {
-  if ($access = skinr_access_handler($op, $form, $form_state)) {
-    // Views uses the same form_id for all forms, but it sets a $section
-    // variable to distinguish between them. So only show the skinr settings
-    // form on the style options form.
-    if ($form_state['section'] != 'style_options') {
-      $access = FALSE;
-    }
-  }
-
-  return $access;
-}
-
-function views_skinr_access_handler_view($op, &$form, $form_state) {
-  // We don't want the skinr settings form to appear on this form. We only want
-  // to intercept it so we can save our cached data.
-
-  // Since we're not using the form, we won't get our form submitter, so let's
-  // add it manually.
-
-  // Only add submit handler once
-  if (!in_array('skinr_ui_form_submit', $form['#submit'])) {
-    $form['#submit'][] = 'skinr_ui_form_submit';
-  }
-  // Special for views
-  if (isset($form['buttons']['save']['#submit']) && !in_array('skinr_ui_form_submit', $form['buttons']['save']['#submit'])) {
-    $form['buttons']['save']['#submit'][] = 'skinr_ui_form_submit';
-  }
-  if (isset($form['buttons']['cancel']['#submit']) && !in_array('skinr_ui_form_submit', $form['buttons']['cancel']['#submit'])) {
-    // Need to make this happen before views' submit handler because it hijacks
-    // things and does a drupal_goto(). That effectively prevents any other
-    // submit handlers from being processed.
-    array_unshift($form['buttons']['cancel']['#submit'], 'skinr_ui_form_submit');
-  }
-
-  return FALSE;
-}
-
-/**
- * Skinr data handler.
- * This is the data that populates the skinr form.
- *
- * @param &$form
- *   Passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   Passes in the $form_state parameter from hook_form_submit().
- * @param $module
- *   The module that is currently being processed.
- * @param $form_settings
- *   The settings from hook_skinr_config() for the form that's currently being
- *   processed.
- *
- * @return
- *   A skinr settings object.
- */
-function views_skinr_data_handler(&$form, $form_state, $theme, $module, $form_settings) {
-  // Ensure we have the required index_handler
-  if (empty($form_settings['index_handler'])) {
-    trigger_error(sprintf("No index_handler was found for form_id '%s' in module '%s'.", $form_id, $module), E_USER_ERROR);
-  }
-  $index = skinr_handler('form_index_handler', 'form', $form_settings['index_handler'], $form, $form_state);
-
-  // Fetch skinr data for this view from cache
-  views_include('cache');
-
-  if ($skinrs = ctools_object_cache_get('skinr', $form_state['view']->name)) {
-    if (isset($skinrs[$theme][$index])) {
-      $skinr = new stdClass();
-      $skinr->theme = $theme;
-      $skinr->module = $module;
-      $skinr->sid = $index;
-      $skinr->skins = $skinrs[$theme][$index];
-
-      return $skinr;
-    }
-    else {
-      return array();
-    }
-  }
-
-  // No data exists in cache, so let's grab it from the regular source
-  return skinr_skin_load($theme, $module, $index);
-}
-
-/**
- * Skinr submit handler.
- *
- * @param &$form
- *   Passes in the $form parameter from hook_form_submit().
- * @param $form_state
- *   Passes in the $form_state parameter from hook_form_submit().
- * @param $module
- *   The module that is currently being processed.
- * @param $form_settings
- *   The settings from hook_skinr_config() for the form that's currently being
- *   processed.
- */
-function views_skinr_submit_handler_display(&$form, $form_state, $module, $form_settings) {
-  foreach ($form_state['values']['skinr_settings'][$module .'_group'] as $theme_name => $theme) {
-    if ((!empty($theme['widgets']) && is_array($theme['widgets'])) || isset($theme['_additional'])) {
-      $sid   = skinr_handler('form_index_handler', 'submit', $form_settings['index_handler'], $form, $form_state);
-      $value = array();
-
-      if (!empty($theme['widgets']) && is_array($theme['widgets'])) {
-        foreach ($theme['widgets'] as $skin_name => $skin_value) {
-          $value['_options'][$skin_name] = $skin_value;
-        }
-      }
-
-      if (isset($theme['_additional'])) {
-        $theme['_additional'] = trim($theme['_additional']);
-        if (!empty($theme['_additional'])) {
-          $value['_additional'] = $theme['_additional'];
-        }
-      }
-
-      if (empty($sid)) {
-        // We didn't receive a valid sid, so raise an error
-        drupal_set_message(t("Skinr settings weren't saved due to an error."), 'error');
-      }
-
-      // Save skinr_settings for this view in cache
-      ctools_include('object-cache');
-      if (!$skinrs = ctools_object_cache_get('skinr', $form_state['view']->name, TRUE)) {
-        $skinrs = array();
-        // Fetch skinr data
-        $skinr = skinr_skin_load($theme_name);
-        if (isset($skinr[$module])) {
-          foreach ($skinr[$module] as $skinr_key => $skinr_value) {
-            if (drupal_substr($skinr_key, 0, drupal_strlen('view-'. $form_state['view']->name)) == 'view-'. $form_state['view']->name) {
-              $skinrs[$theme_name][$skinr_key] = $skinr_value;
-            }
-          }
-        }
-      }
-      $skinrs[$theme_name][$sid] = $value;
-      ctools_object_cache_set('skinr', $form_state['view']->name, $skinrs);
-    }
-  }
-}
-
-function views_skinr_submit_handler_view(&$form, $form_state, $module, $form_settings) {
-  switch ($form_state['values']['op']) {
-    case t('Save'):
-      // Fetch skinr data for this view from cache
-      ctools_include('object-cache');
-
-      if ($skinrs = ctools_object_cache_get('skinr', $form_state['view']->name, TRUE)) {
-        foreach ($skinrs as $theme_name => $theme) {
-          foreach ($theme as $sid => $skins) {
-            $skinr = new stdClass();
-            $skinr->theme = $theme_name;
-            $skinr->module = $module;
-            $skinr->sid = $sid;
-            $skinr->skins = $skins;
-
-            skinr_skin_save($skinr);
-          }
-        }
-        ctools_object_cache_clear('skinr', $form_state['view']->name);
-      }
-      break;
-    case t('Cancel'):
-      // Remove our data from views cache
-      ctools_include('object-cache');
-
-      ctools_object_cache_clear('skinr', $form_state['view']->name);
-      break;
-  }
-}
-
-/**
  * Skinr form preprocess hook callback.
  *
  * @param &$form