BOINC / boinc

drupal/sites/default/boinc/modules/contrib/features/tests/features_test.views_default.inc

Indentation +20 added lines, -20 removed lines

@@ -4,29 +4,29 @@
  * Implementation of hook_views_default_views().
  */
 function features_test_views_default_views() {
-  $views = array();
+    $views = array();
 
-  // Exported view: features_test
-  $view = new view;
-  $view->name = 'features_test';
-  $view->description = 'Test view provided by Features testing module.';
-  $view->tag = 'testing';
-  $view->view_php = '';
-  $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('access', array(
+    // Exported view: features_test
+    $view = new view;
+    $view->name = 'features_test';
+    $view->description = 'Test view provided by Features testing module.';
+    $view->tag = 'testing';
+    $view->view_php = '';
+    $view->base_table = 'node';
+    $view->is_cacheable = FALSE;
+    $view->api_version = 2;
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('title', 'Test');
-  $handler->override_option('row_plugin', 'node');
+    ));
+    $handler->override_option('title', 'Test');
+    $handler->override_option('row_plugin', 'node');
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  return $views;
+    return $views;
 }

drupal/sites/default/boinc/modules/contrib/features/tests/features_test.features.fieldgroup.inc

Indentation +28 added lines, -28 removed lines

@@ -4,63 +4,63 @@
  * Implementation of hook_fieldgroup_default_groups().
  */
 function features_test_fieldgroup_default_groups() {
-  $groups = array();
+    $groups = array();
 
-  // Exported group: group_features_test
-  $groups['features_test-group_features_test'] = array(
+    // Exported group: group_features_test
+    $groups['features_test-group_features_test'] = array(
     'group_type' => 'standard',
     'type_name' => 'features_test',
     'group_name' => 'group_features_test',
     'label' => 'Test fieldgroup',
     'settings' => array(
-      'form' => array(
+        'form' => array(
         'style' => 'fieldset',
         'description' => '',
-      ),
-      'display' => array(
+        ),
+        'display' => array(
         'description' => '',
         'label' => 'above',
         '5' => array(
-          'format' => 'fieldset',
-          'exclude' => 0,
+            'format' => 'fieldset',
+            'exclude' => 0,
         ),
         'teaser' => array(
-          'format' => 'fieldset',
-          'exclude' => 0,
+            'format' => 'fieldset',
+            'exclude' => 0,
         ),
         'full' => array(
-          'format' => 'fieldset',
-          'exclude' => 0,
+            'format' => 'fieldset',
+            'exclude' => 0,
         ),
         '4' => array(
-          'format' => 'fieldset',
-          'exclude' => 0,
+            'format' => 'fieldset',
+            'exclude' => 0,
         ),
         '2' => array(
-          'format' => 'fieldset',
-          'exclude' => 0,
+            'format' => 'fieldset',
+            'exclude' => 0,
         ),
         '3' => array(
-          'format' => 'fieldset',
-          'exclude' => 0,
+            'format' => 'fieldset',
+            'exclude' => 0,
         ),
         'token' => array(
-          'format' => 'fieldset',
-          'exclude' => 0,
+            'format' => 'fieldset',
+            'exclude' => 0,
+        ),
         ),
-      ),
     ),
     'weight' => '35',
     'fields' => array(
-      '0' => 'field_features_test_child_a',
-      '1' => 'field_features_test_child_b',
+        '0' => 'field_features_test_child_a',
+        '1' => 'field_features_test_child_b',
     ),
-  );
+    );
 
-  // Translatables
-  array(
+    // Translatables
+    array(
     t('Test fieldgroup'),
-  );
+    );
 
-  return $groups;
+    return $groups;
 }

drupal/sites/default/boinc/modules/contrib/features/features.export.inc

Indentation +371 added lines, -371 removed lines

@@ -6,25 +6,25 @@ 
  * @return
  */
 function features_populate($items, $dependencies, $module_name) {
-  // Sanitize items.
-  $items = array_filter($items);
-  $items['dependencies'] = drupal_map_assoc(array_filter($dependencies));
+    // Sanitize items.
+    $items = array_filter($items);
+    $items['dependencies'] = drupal_map_assoc(array_filter($dependencies));
 
-  // Populate stub
-  $stub = array('features' => array(), 'dependencies' => array(), 'conflicts' => array());
-  $export = _features_populate($items, $stub, $module_name);
+    // Populate stub
+    $stub = array('features' => array(), 'dependencies' => array(), 'conflicts' => array());
+    $export = _features_populate($items, $stub, $module_name);
 
-  // Allow other modules to alter the export.
-  drupal_alter('features_export', $export, $module_name);
+    // Allow other modules to alter the export.
+    drupal_alter('features_export', $export, $module_name);
 
-  // Clean up and standardize order
-  foreach (array_keys($export['features']) as $k) {
+    // Clean up and standardize order
+    foreach (array_keys($export['features']) as $k) {
     ksort($export['features'][$k]);
-  }
-  ksort($export['features']);
-  ksort($export['dependencies']);
+    }
+    ksort($export['features']);
+    ksort($export['dependencies']);
 
-  return $export;
+    return $export;
 }
 
 /**
@@ -41,39 +41,39 @@ 
  * @return fully populated $export array.
  */
 function _features_populate($pipe, &$export, $module_name = '') {
-  features_include();
-  foreach ($pipe as $component => $data) {
+    features_include();
+    foreach ($pipe as $component => $data) {
     // Convert already defined items to dependencies.
     _features_resolve_dependencies($data, $export, $module_name, $component);
     if (!empty($data) && $function = features_hook($component, 'features_export')) {
-      // Pass module-specific data and export array.
-      // We don't use features_invoke() here since we need to pass $export by reference.
-      $more = $function($data, $export, $module_name, $component);
-      // Allow other modules to manipulate the pipe to add in additional modules.
-      drupal_alter('features_pipe_' . $component, $more, $data, $export);
-      // Allow for export functions to request additional exports.
-      if (!empty($more)) {
+        // Pass module-specific data and export array.
+        // We don't use features_invoke() here since we need to pass $export by reference.
+        $more = $function($data, $export, $module_name, $component);
+        // Allow other modules to manipulate the pipe to add in additional modules.
+        drupal_alter('features_pipe_' . $component, $more, $data, $export);
+        // Allow for export functions to request additional exports.
+        if (!empty($more)) {
         _features_populate($more, $export, $module_name);
-      }
+        }
+    }
     }
-  }
-  return $export;
+    return $export;
 }
 
 /**
  * Iterates over data and convert to dependencies if already defined elsewhere.
  */
 function _features_resolve_dependencies(&$data, &$export, $module_name, $component) {
-  if ($map = features_get_default_map($component)) {
+    if ($map = features_get_default_map($component)) {
     foreach ($data as $key => $item) {
-      // If the node type is provided by a different module, add the provider as
-      // a dependency.
-      if (isset($map[$item]) && $map[$item] != $module_name) {
+        // If the node type is provided by a different module, add the provider as
+        // a dependency.
+        if (isset($map[$item]) && $map[$item] != $module_name) {
         $export['dependencies'][$map[$item]] = $map[$item];
         unset($data[$key]);
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -81,115 +81,115 @@ 
  * captured by other modules 'higher up'.
  */
 function _features_export_minimize_dependencies($dependencies, $module_name = '') {
-  // Ensure that the module doesn't depend upon itself
-  if (!empty($module_name) && !empty($dependencies[$module_name])) {
+    // Ensure that the module doesn't depend upon itself
+    if (!empty($module_name) && !empty($dependencies[$module_name])) {
     unset($dependencies[$module_name]);
-  }
-
-  // Do some cleanup:
-  // - Remove modules required by Drupal core.
-  // - Protect against direct circular dependencies.
-  // - Remove "intermediate" dependencies.
-  $required = drupal_required_modules();
-  foreach ($dependencies as $k => $v) {
+    }
+
+    // Do some cleanup:
+    // - Remove modules required by Drupal core.
+    // - Protect against direct circular dependencies.
+    // - Remove "intermediate" dependencies.
+    $required = drupal_required_modules();
+    foreach ($dependencies as $k => $v) {
     if (empty($v) || in_array($v, $required)) {
-      unset($dependencies[$k]);
+        unset($dependencies[$k]);
     }
     else {
-      $module = features_get_modules($v);
-      if ($module && !empty($module->info['dependencies'])) {
+        $module = features_get_modules($v);
+        if ($module && !empty($module->info['dependencies'])) {
         // If this dependency depends on the module itself, we have a circular dependency.
         // Don't let it happen. Only you can prevent forest fires.
         if (in_array($module_name, $module->info['dependencies'])) {
-          unset($dependencies[$k]);
+            unset($dependencies[$k]);
         }
         // Iterate through the dependency's dependencies and remove any dependencies
         // that are captured by it.
         else {
-          foreach ($module->info['dependencies'] as $j => $dependency) {
+            foreach ($module->info['dependencies'] as $j => $dependency) {
             if (array_search($dependency, $dependencies) !== FALSE) {
-              $position = array_search($dependency, $dependencies);
-              unset($dependencies[$position]);
+                $position = array_search($dependency, $dependencies);
+                unset($dependencies[$position]);
+            }
             }
-          }
         }
-      }
+        }
     }
-  }
-  return drupal_map_assoc(array_unique($dependencies));
+    }
+    return drupal_map_assoc(array_unique($dependencies));
 }
 
 /**
  * Iterates over a list of dependencies and maximize the list of modules.
  */
 function _features_export_maximize_dependencies($dependencies, $module_name = '', $maximized = array(), $first = TRUE) {
-  foreach ($dependencies as $k => $v) {
+    foreach ($dependencies as $k => $v) {
     if (!in_array($v, $maximized)) {
-      $maximized[] = $v;
-      $module = features_get_modules($v);
-      if ($module && !empty($module->info['dependencies'])) {
+        $maximized[] = $v;
+        $module = features_get_modules($v);
+        if ($module && !empty($module->info['dependencies'])) {
         $maximized = array_merge($maximized, _features_export_maximize_dependencies($module->info['dependencies'], $module_name, $maximized, FALSE));
-      }
+        }
+    }
     }
-  }
-  return array_unique($maximized);
+    return array_unique($maximized);
 }
 
 /**
  * Prepare a feature export array into a finalized info array.
  */
 function features_export_prepare($export, $module_name, $reset = FALSE) {
-  $existing = features_get_modules($module_name, $reset);
+    $existing = features_get_modules($module_name, $reset);
 
-  // Prepare info string -- if module exists, merge into its existing info file
-  $defaults = $existing ? $existing->info : array('core' => '6.x', 'package' => 'Features');
-  $export = array_merge($defaults, $export);
+    // Prepare info string -- if module exists, merge into its existing info file
+    $defaults = $existing ? $existing->info : array('core' => '6.x', 'package' => 'Features');
+    $export = array_merge($defaults, $export);
 
-  // Cleanup info array
-  foreach ($export['features'] as $component => $data) {
+    // Cleanup info array
+    foreach ($export['features'] as $component => $data) {
     $export['features'][$component] = array_keys($data);
-  }
-  if (isset($export['dependencies'])) {
+    }
+    if (isset($export['dependencies'])) {
     $export['dependencies'] = array_values($export['dependencies']);
-  }
-  if (isset($export['conflicts'])) {
+    }
+    if (isset($export['conflicts'])) {
     unset($export['conflicts']);
-  }
+    }
 
-  // Order info array.
-  $standard_info = array();
-  foreach (array('name', 'description', 'core', 'package', 'php', 'version', 'project', 'dependencies') as $item) {
+    // Order info array.
+    $standard_info = array();
+    foreach (array('name', 'description', 'core', 'package', 'php', 'version', 'project', 'dependencies') as $item) {
     if (isset($export[$item])) {
-      $standard_info[$item] = $export[$item];
+        $standard_info[$item] = $export[$item];
+    }
     }
-  }
 
-  $export = array_diff_assoc($export, $standard_info);
-  ksort($export);
-  return array_merge($standard_info, $export);
+    $export = array_diff_assoc($export, $standard_info);
+    ksort($export);
+    return array_merge($standard_info, $export);
 }
 
 /**
  * Generate an array of hooks and their raw code.
  */
 function features_export_render_hooks($export, $module_name, $reset = FALSE) {
-  features_include();
-  $code = array();
+    features_include();
+    $code = array();
 
-  // Sort components to keep exported code consistent
-  ksort($export['features']);
+    // Sort components to keep exported code consistent
+    ksort($export['features']);
 
-  foreach ($export['features'] as $component => $data) {
+    foreach ($export['features'] as $component => $data) {
     if (!empty($data)) {
-      // Sort the items so that we don't generate different exports based on order
-      asort($data);
-      if (features_hook($component, 'features_export_render')) {
+        // Sort the items so that we don't generate different exports based on order
+        asort($data);
+        if (features_hook($component, 'features_export_render')) {
         $hooks = features_invoke($component, 'features_export_render', $module_name, $data, $export);
         $code[$component] = $hooks;
-      }
+        }
     }
-  }
-  return $code;
+    }
+    return $code;
 }
 
 /**
@@ -206,90 +206,90 @@ 
  * @return array of info file and module file contents.
  */
 function features_export_render($export, $module_name, $reset = FALSE) {
-  $code = array();
+    $code = array();
 
-  // Generate hook code
-  $component_hooks = features_export_render_hooks($export, $module_name, $reset);
-  $components = features_get_components();
+    // Generate hook code
+    $component_hooks = features_export_render_hooks($export, $module_name, $reset);
+    $components = features_get_components();
 
-  // Group component code into their respective files
-  foreach ($component_hooks as $component => $hooks) {
+    // Group component code into their respective files
+    foreach ($component_hooks as $component => $hooks) {
     $file = array('name' => 'features');
     if (isset($components[$component]['default_file'])) {
-      switch ($components[$component]['default_file']) {
+        switch ($components[$component]['default_file']) {
         case FEATURES_DEFAULTS_INCLUDED:
           $file['name'] = "features.$component";
-          break;
+            break;
         case FEATURES_DEFAULTS_CUSTOM:
           $file['name'] = $components[$component]['default_filename'];
-          break;
-      }
+            break;
+        }
     }
 
     if (!isset($code[$file['name']])) {
-      $code[$file['name']] = array();
+        $code[$file['name']] = array();
     }
 
     foreach ($hooks as $hook_name => $hook_code) {
-      $code[$file['name']][$hook_name] = features_export_render_defaults($module_name, $hook_name, $hook_code);
+        $code[$file['name']][$hook_name] = features_export_render_defaults($module_name, $hook_name, $hook_code);
+    }
     }
-  }
 
-  // Finalize strings to be written to files
-  foreach ($code as $filename => $contents) {
+    // Finalize strings to be written to files
+    foreach ($code as $filename => $contents) {
     $code[$filename] = "<?php\n\n". implode("\n\n", $contents) ."\n";
-  }
+    }
 
-  // Generate info file output
-  $export = features_export_prepare($export, $module_name, $reset);
-  $code['info'] = features_export_info($export);
+    // Generate info file output
+    $export = features_export_prepare($export, $module_name, $reset);
+    $code['info'] = features_export_info($export);
 
-  // Prepare the module
-  // If module exists, let it be and include it in the files
-  if ($existing = features_get_modules($module_name, TRUE)) {
+    // Prepare the module
+    // If module exists, let it be and include it in the files
+    if ($existing = features_get_modules($module_name, TRUE)) {
     $code['module'] = file_get_contents($existing->filename);
 
     // If the current module file does not reference the features.inc include,
     // set a warning message.
     if (isset($code['features']) && strpos($code['module'], "{$module_name}.features.inc") === FALSE) {
-      features_log(t('@module does not appear to include the @include file.', array('@module' => "{$module_name}.module", '@include' => "{$module_name}.features.inc")), 'warning');
+        features_log(t('@module does not appear to include the @include file.', array('@module' => "{$module_name}.module", '@include' => "{$module_name}.features.inc")), 'warning');
     }
 
     // Deprecated files. Display a message for any of these files letting the
     // user know that they may be removed.
     $deprecated = array(
-      "{$module_name}.defaults",
-      "{$module_name}.features.views",
-      "{$module_name}.features.node"
+        "{$module_name}.defaults",
+        "{$module_name}.features.views",
+        "{$module_name}.features.node"
     );
     foreach (file_scan_directory(drupal_get_path('module', $module_name), '.*') as $file) {
-      if (in_array($file->name, $deprecated, TRUE)) {
+        if (in_array($file->name, $deprecated, TRUE)) {
         features_log(t('The file @filename has been deprecated and can be removed.', array('@filename' => $file->basename)), 'status');
-      }
-      elseif ($file->name === "{$module_name}.features" && empty($code['features'])) {
+        }
+        elseif ($file->name === "{$module_name}.features" && empty($code['features'])) {
         $code['features'] = "<?php\n\n// This file is deprecated and can be removed.\n// Please remove include_once('{$module_name}.features.inc') in {$module_name}.module as well.\n";
-      }
+        }
     }
-  }
-  // Add a stub module to include the defaults
-  else if (!empty($code['features'])) {
+    }
+    // Add a stub module to include the defaults
+    else if (!empty($code['features'])) {
     $code['module'] = "<?php\n\ninclude_once('{$module_name}.features.inc');\n";
-  }
-  else {
+    }
+    else {
     $code['module'] = "<?php\n\n// Drupal needs this blank file.\n";
-  }
-  return $code;
+    }
+    return $code;
 }
 
 /**
  * Detect differences between DB and code components of a feature.
  */
 function features_detect_overrides($module) {
-  static $cache;
-  if (!isset($cache)) {
+    static $cache;
+    if (!isset($cache)) {
     $cache = array();
-  }
-  if (!isset($cache[$module->name])) {
+    }
+    if (!isset($cache[$module->name])) {
     // Rebuild feature from .info file description and prepare an export from current DB state.
     $export = features_populate($module->info['features'], $module->info['dependencies'], $module->name);
     $export = features_export_prepare($export, $module->name);
@@ -302,13 +302,13 @@ 
 
     $compare = array('normal' => features_export_info($export), 'default' => features_export_info($module->info));
     if ($compare['normal'] !== $compare['default']) {
-      $overridden['info'] = $compare;
+        $overridden['info'] = $compare;
     }
 
     // Collect differences at a per-component level
     $states = features_get_component_states(array($module->name), FALSE);
     foreach ($states[$module->name] as $component => $state) {
-      if ($state != FEATURES_DEFAULT) {
+        if ($state != FEATURES_DEFAULT) {
         $normal = features_get_normal($component, $module->name);
         $default = features_get_default($component, $module->name);
         _features_sanitize($normal);
@@ -316,50 +316,50 @@ 
 
         $compare = array('normal' => features_var_export($normal), 'default' => features_var_export($default));
         if (_features_linetrim($compare['normal']) !== _features_linetrim($compare['default'])) {
-          $overridden[$component] = $compare;
+            $overridden[$component] = $compare;
+        }
         }
-      }
     }
     $cache[$module->name] = $overridden;
-  }
-  return $cache[$module->name];
+    }
+    return $cache[$module->name];
 }
 
 /**
  * Gets the available default hooks keyed by components.
  */
 function features_get_default_hooks($component = NULL, $reset = FALSE) {
-  static $hooks;
-  if (!isset($hooks) || $reset) {
+    static $hooks;
+    if (!isset($hooks) || $reset) {
     $hooks = array();
     features_include();
     foreach (module_implements('features_api') as $module) {
-      $info = module_invoke($module, 'features_api');
-      foreach ($info as $k => $v) {
+        $info = module_invoke($module, 'features_api');
+        foreach ($info as $k => $v) {
         if (isset($v['default_hook'])) {
-          $hooks[$k] = $v['default_hook'];
+            $hooks[$k] = $v['default_hook'];
         }
-      }
+        }
+    }
     }
-  }
-  if (isset($component)) {
+    if (isset($component)) {
     return isset($hooks[$component]) ? $hooks[$component] : FALSE;
-  }
-  return $hooks;
+    }
+    return $hooks;
 }
 
 /**
  * Return a code string representing an implementation of a defaults module hook.
  */
 function features_export_render_defaults($module, $hook, $code) {
-  $output = array();
-  $output[] = "/**";
-  $output[] = " * Implementation of hook_{$hook}().";
-  $output[] = " */";
-  $output[] = "function {$module}_{$hook}() {";
-  $output[] = $code;
-  $output[] = "}";
-  return implode("\n", $output);
+    $output = array();
+    $output[] = "/**";
+    $output[] = " * Implementation of hook_{$hook}().";
+    $output[] = " */";
+    $output[] = "function {$module}_{$hook}() {";
+    $output[] = $code;
+    $output[] = "}";
+    return implode("\n", $output);
 }
 
 /**
@@ -374,23 +374,23 @@ 
  *   A code string ready to be written to a module's .info file.
  */
 function features_export_info($info, $parents = array()) {
-  $output = '';
-  if (is_array($info)) {
+    $output = '';
+    if (is_array($info)) {
     foreach ($info as $k => $v) {
-      $child = $parents;
-      $child[] = $k;
-      $output .= features_export_info($v, $child);
+        $child = $parents;
+        $child[] = $k;
+        $output .= features_export_info($v, $child);
     }
-  }
-  else if (!empty($info) && count($parents)) {
+    }
+    else if (!empty($info) && count($parents)) {
     $line = array_shift($parents);
     foreach ($parents as $key) {
-      $line .= is_numeric($key) ? "[]" : "[{$key}]";
+        $line .= is_numeric($key) ? "[]" : "[{$key}]";
     }
     $line .=  " = \"{$info}\"\n";
     return $line;
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
@@ -405,81 +405,81 @@ 
  *   A string of the tar file contents.
  */
 function features_tar_create($name, $contents) {
-  $tar = '';
-  $binary_data_first = pack("a100a8a8a8a12A12",
+    $tar = '';
+    $binary_data_first = pack("a100a8a8a8a12A12",
     $name,
     '100644 ', // File permissions
     '   765 ', // UID,
     '   765 ', // GID,
     sprintf("%11s ", decoct(strlen($contents))), // Filesize,
     sprintf("%11s", decoct(time())) // Creation time
-  );
-  $binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12", '', '', '', '', '', '', '', '', '', '');
+    );
+    $binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12", '', '', '', '', '', '', '', '', '', '');
 
-  $checksum = 0;
-  for ($i = 0; $i < 148; $i++) {
+    $checksum = 0;
+    for ($i = 0; $i < 148; $i++) {
     $checksum += ord(substr($binary_data_first, $i, 1));
-  }
-  for ($i = 148; $i < 156; $i++) {
+    }
+    for ($i = 148; $i < 156; $i++) {
     $checksum += ord(' ');
-  }
-  for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+    }
+    for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
     $checksum += ord(substr($binary_data_last, $j, 1));
-  }
+    }
 
-  $tar .= $binary_data_first;
-  $tar .= pack("a8", sprintf("%6s ", decoct($checksum)));
-  $tar .= $binary_data_last;
+    $tar .= $binary_data_first;
+    $tar .= pack("a8", sprintf("%6s ", decoct($checksum)));
+    $tar .= $binary_data_last;
 
-  $buffer = str_split($contents, 512);
-  foreach ($buffer as $item) {
+    $buffer = str_split($contents, 512);
+    foreach ($buffer as $item) {
     $tar .= pack("a512", $item);
-  }
-  return $tar;
+    }
+    return $tar;
 }
 
 /**
  * Export var function -- from Views.
  */
 function features_var_export($var, $prefix = '', $init = TRUE) {
-  if (is_object($var)) {
+    if (is_object($var)) {
     $output = method_exists($var, 'export') ? $var->export() : features_var_export((array) $var);
-  }
-  else if (is_array($var)) {
+    }
+    else if (is_array($var)) {
     if (empty($var)) {
-      $output = 'array()';
+        $output = 'array()';
     }
     else {
-      $output = "array(\n";
-      foreach ($var as $key => $value) {
+        $output = "array(\n";
+        foreach ($var as $key => $value) {
         $output .= "  '$key' => " . features_var_export($value, '  ', FALSE) . ",\n";
-      }
-      $output .= ')';
+        }
+        $output .= ')';
     }
-  }
-  else if (is_bool($var)) {
+    }
+    else if (is_bool($var)) {
     $output = $var ? 'TRUE' : 'FALSE';
-  }
-  else if (is_string($var) && strpos($var, "\n") !== FALSE) {
+    }
+    else if (is_string($var) && strpos($var, "\n") !== FALSE) {
     // Replace line breaks in strings with a token for replacement
     // at the very end. This protects whitespace in strings from
     // unintentional indentation.
     $var = str_replace("\n", "***BREAK***", $var);
     $output = var_export($var, TRUE);
-  }
-  else {
+    }
+    else {
     $output = var_export($var, TRUE);
-  }
+    }
 
-  if ($prefix) {
+    if ($prefix) {
     $output = str_replace("\n", "\n$prefix", $output);
-  }
+    }
 
-  if ($init) {
+    if ($init) {
     $output = str_replace("***BREAK***", "\n", $output);
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -488,30 +488,30 @@ 
  * export so that string extractors like potx can detect them.
  */
 function features_translatables_export($translatables, $indent = '') {
-  $output = '';
-  $translatables = array_filter(array_unique($translatables));
-  if (!empty($translatables)) {
+    $output = '';
+    $translatables = array_filter(array_unique($translatables));
+    if (!empty($translatables)) {
     $output .= "{$indent}// Translatables\n";
     $output .= "{$indent}// Included for use with string extractors like potx.\n";
     sort($translatables);
     foreach ($translatables as $string) {
-      $output .= "{$indent}t(" . features_var_export($string) . ");\n";
+        $output .= "{$indent}t(" . features_var_export($string) . ");\n";
+    }
     }
-  }
-  return $output;
+    return $output;
 }
 
 /**
  * Get a summary storage state for a feature.
  */
 function features_get_storage($module_name) {
-  // Get component states, and array_diff against array(FEATURES_DEFAULT).
-  // If the returned array has any states that don't match FEATURES_DEFAULT,
-  // return the highest state.
-  $states = features_get_component_states(array($module_name), FALSE);
-  $states = array_diff($states[$module_name], array(FEATURES_DEFAULT));
-  $storage = !empty($states) ? max($states) : FEATURES_DEFAULT;
-  return $storage;
+    // Get component states, and array_diff against array(FEATURES_DEFAULT).
+    // If the returned array has any states that don't match FEATURES_DEFAULT,
+    // return the highest state.
+    $states = features_get_component_states(array($module_name), FALSE);
+    $states = array_diff($states[$module_name], array(FEATURES_DEFAULT));
+    $storage = !empty($states) ? max($states) : FEATURES_DEFAULT;
+    return $storage;
 }
 
 /**
@@ -520,233 +520,233 @@ 
  * of a module's component.
  */
 function features_get_signature($state = 'default', $module_name, $component, $reset = FALSE) {
-  switch ($state) {
+    switch ($state) {
     case 'cache':
       $codecache = variable_get('features_codecache', array());
-      return isset($codecache[$module_name][$component]) ? $codecache[$module_name][$component] : FALSE;
+        return isset($codecache[$module_name][$component]) ? $codecache[$module_name][$component] : FALSE;
     case 'default':
       $objects = features_get_default($component, $module_name, TRUE, $reset);
-      break;
+        break;
     case 'normal':
       $objects = features_get_normal($component, $module_name, $reset);
-      break;
-  }
-  if (!empty($objects)) {
+        break;
+    }
+    if (!empty($objects)) {
     $objects = (array) $objects;
     _features_sanitize($objects);
     return md5(_features_linetrim(features_var_export($objects)));
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Set the signature of a module/component pair in the codecache.
  */
 function features_set_signature($module, $component, $signature = NULL) {
-  $var_codecache = variable_get('features_codecache', array());
-  $signature = isset($signature) ? $signature : features_get_signature('default', $module, $component, TRUE);
-  $var_codecache[$module][$component] = $signature;
-  variable_set('features_codecache', $var_codecache);
+    $var_codecache = variable_get('features_codecache', array());
+    $signature = isset($signature) ? $signature : features_get_signature('default', $module, $component, TRUE);
+    $var_codecache[$module][$component] = $signature;
+    variable_set('features_codecache', $var_codecache);
 }
 
 /**
  * Processing semaphore operations.
  */
 function features_semaphore($op, $component) {
-  // Note: we don't use variable_get() here as the inited variable
-  // static cache may be stale. Retrieving directly from the DB narrows
-  // the possibility of collision.
-  $semaphore = db_result(db_query("SELECT value FROM {variable} WHERE name = 'features_semaphore'"));
-  $semaphore = !empty($semaphore) ? unserialize($semaphore) : array();
+    // Note: we don't use variable_get() here as the inited variable
+    // static cache may be stale. Retrieving directly from the DB narrows
+    // the possibility of collision.
+    $semaphore = db_result(db_query("SELECT value FROM {variable} WHERE name = 'features_semaphore'"));
+    $semaphore = !empty($semaphore) ? unserialize($semaphore) : array();
 
-  switch ($op) {
+    switch ($op) {
     case 'get':
       return isset($semaphore[$component]) ? $semaphore[$component] : FALSE;
     case 'set':
       $semaphore[$component] = time();
-      variable_set('features_semaphore', $semaphore);
-      break;
+        variable_set('features_semaphore', $semaphore);
+        break;
     case 'del':
       if (isset($semaphore[$component])) {
         unset($semaphore[$component]);
         variable_set('features_semaphore', $semaphore);
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
  * Get normal objects for a given module/component pair.
  */
 function features_get_normal($component, $module_name, $reset = FALSE) {
-  static $cache;
-  if (!isset($cache) || $reset) {
+    static $cache;
+    if (!isset($cache) || $reset) {
     $cache = array();
-  }
-  if (!isset($cache[$module_name][$component])) {
+    }
+    if (!isset($cache[$module_name][$component])) {
     features_include();
     $code = NULL;
     $module = features_get_features($module_name);
 
     // Special handling for dependencies component.
     if ($component === 'dependencies') {
-      $cache[$module_name][$component] = isset($module->info['dependencies']) ? array_filter($module->info['dependencies'], 'module_exists') : array();
+        $cache[$module_name][$component] = isset($module->info['dependencies']) ? array_filter($module->info['dependencies'], 'module_exists') : array();
     }
     // All other components.
     else {
-      $default_hook = features_get_default_hooks($component);
-      if ($module && $default_hook && isset($module->info['features'][$component]) && features_hook($component, 'features_export_render')) {
+        $default_hook = features_get_default_hooks($component);
+        if ($module && $default_hook && isset($module->info['features'][$component]) && features_hook($component, 'features_export_render')) {
         $code = features_invoke($component, 'features_export_render', $module_name, $module->info['features'][$component], NULL);
         $cache[$module_name][$component] = isset($code[$default_hook]) ? eval($code[$default_hook]) : FALSE;
-      }
+        }
     }
 
     // Clear out vars for memory's sake.
     unset($code);
     unset($module);
-  }
-  return isset($cache[$module_name][$component]) ? $cache[$module_name][$component] : FALSE;
+    }
+    return isset($cache[$module_name][$component]) ? $cache[$module_name][$component] : FALSE;
 }
 
 /**
  * Get defaults for a given module/component pair.
  */
 function features_get_default($component, $module_name = NULL, $alter = TRUE, $reset = FALSE) {
-  static $cache = array();
-  features_include();
-  features_include_defaults($component);
-  $default_hook = features_get_default_hooks($component);
-  $components = features_get_components();
-
-  // Collect defaults for all modules if no module name was specified.
-  if (isset($module_name)) {
+    static $cache = array();
+    features_include();
+    features_include_defaults($component);
+    $default_hook = features_get_default_hooks($component);
+    $components = features_get_components();
+
+    // Collect defaults for all modules if no module name was specified.
+    if (isset($module_name)) {
     $modules = array($module_name);
-  }
-  else {
+    }
+    else {
     if ($component === 'dependencies') {
-      $modules = array_keys(features_get_features());
+        $modules = array_keys(features_get_features());
     }
     else {
-      $modules = array();
-      foreach (features_get_component_map($component) as $component_modules) {
+        $modules = array();
+        foreach (features_get_component_map($component) as $component_modules) {
         $modules = array_merge($modules, $component_modules);
-      }
-      $modules = array_unique($modules);
+        }
+        $modules = array_unique($modules);
+    }
     }
-  }
 
-  // Collect and cache information for each specified module.
-  foreach ($modules as $m) {
+    // Collect and cache information for each specified module.
+    foreach ($modules as $m) {
     if (!isset($cache[$component][$m]) || $reset) {
-      // Special handling for dependencies component.
-      if ($component === 'dependencies') {
+        // Special handling for dependencies component.
+        if ($component === 'dependencies') {
         $module = features_get_features($m);
         $cache[$component][$m] = isset($module->info['dependencies']) ? $module->info['dependencies'] : array();
         unset($module);
-      }
-      // All other components
-      else {
+        }
+        // All other components
+        else {
         if ($default_hook && function_exists("{$m}_{$default_hook}")) {
-          $cache[$component][$m] = call_user_func("{$m}_{$default_hook}");
-          if ($alter) {
+            $cache[$component][$m] = call_user_func("{$m}_{$default_hook}");
+            if ($alter) {
             drupal_alter($default_hook, $cache[$component][$m]);
-          }
+            }
         }
         else {
-          $cache[$component][$m] = FALSE;
+            $cache[$component][$m] = FALSE;
         }
-      }
+        }
+    }
     }
-  }
 
-  // A specific module was specified. Retrieve only its components.
-  if (isset($module_name)) {
+    // A specific module was specified. Retrieve only its components.
+    if (isset($module_name)) {
     return isset($cache[$component][$module_name]) ? $cache[$component][$module_name] : FALSE;
-  }
-  // No module was specified. Retrieve all components.
-  $all_defaults = array();
-  if (isset($cache[$component])) {
+    }
+    // No module was specified. Retrieve all components.
+    $all_defaults = array();
+    if (isset($cache[$component])) {
     foreach (array_filter($cache[$component]) as $module_components) {
-      $all_defaults = array_merge($all_defaults, $module_components);
+        $all_defaults = array_merge($all_defaults, $module_components);
     }
-  }
-  return $all_defaults;
+    }
+    return $all_defaults;
 }
 
 /**
  * Get a map of components to their providing modules.
  */
 function features_get_default_map($component, $attribute = NULL, $callback = NULL, $reset = FALSE) {
-  static $map = array();
-  features_include();
-  features_include_defaults($component);
-  if ((!isset($map[$component]) || $reset) && $default_hook = features_get_default_hooks($component)) {
+    static $map = array();
+    features_include();
+    features_include_defaults($component);
+    if ((!isset($map[$component]) || $reset) && $default_hook = features_get_default_hooks($component)) {
     $map[$component] = array();
     foreach (module_implements($default_hook) as $module) {
-      if ($defaults = features_get_default($component, $module)) {
+        if ($defaults = features_get_default($component, $module)) {
         foreach ($defaults as $key => $object) {
-          if (isset($callback)) {
+            if (isset($callback)) {
             if ($object_key = $callback($object)) {
-              $map[$component][$object_key] = $module;
+                $map[$component][$object_key] = $module;
+            }
             }
-          }
-          elseif (isset($attribute)) {
+            elseif (isset($attribute)) {
             if (is_object($object) && isset($object->{$attribute})) {
-              $map[$component][$object->{$attribute}] = $module;
+                $map[$component][$object->{$attribute}] = $module;
             }
             elseif (is_array($object) && isset($object[$attribute])) {
-              $map[$component][$object[$attribute]] = $module;
+                $map[$component][$object[$attribute]] = $module;
             }
-          }
-          elseif (!isset($attribute) && !isset($callback)) {
+            }
+            elseif (!isset($attribute) && !isset($callback)) {
             if (!is_numeric($key)) {
-              $map[$component][$key] = $module;
+                $map[$component][$key] = $module;
+            }
             }
-          }
-          else {
+            else {
             return FALSE;
-          }
+            }
+        }
         }
-      }
     }
-  }
-  return isset($map[$component]) ? $map[$component] : FALSE;
+    }
+    return isset($map[$component]) ? $map[$component] : FALSE;
 }
 
 /**
  * Retrieve an array of features/components and their current states.
  */
 function features_get_component_states($features = array(), $rebuild_only = TRUE, $reset = FALSE) {
-  static $cache;
-  if (!isset($cache) || $reset) {
+    static $cache;
+    if (!isset($cache) || $reset) {
     $cache = array();
-  }
+    }
 
-  $features = !empty($features) ? $features : array_keys(features_get_features());
+    $features = !empty($features) ? $features : array_keys(features_get_features());
 
-  // Retrieve only rebuildable components if requested.
-  features_include();
-  $components = array_keys(features_get_components());
-  if ($rebuild_only) {
+    // Retrieve only rebuildable components if requested.
+    features_include();
+    $components = array_keys(features_get_components());
+    if ($rebuild_only) {
     foreach ($components as $k => $component) {
-      if (!features_hook($component, 'features_rebuild')) {
+        if (!features_hook($component, 'features_rebuild')) {
         unset($components[$k]);
-      }
+        }
+    }
     }
-  }
 
-  foreach ($features as $feature) {
+    foreach ($features as $feature) {
     $cache[$feature] = isset($cache[$feature]) ? $cache[$feature] : array();
     if (module_exists($feature)) {
-      foreach ($components as $component) {
+        foreach ($components as $component) {
         if (!isset($cache[$feature][$component])) {
-          $normal = features_get_signature('normal', $feature, $component, $reset);
-          $default = features_get_signature('default', $feature, $component, $reset);
-          $codecache = features_get_signature('cache', $feature, $component, $reset);
-          $semaphore = features_semaphore('get', $component);
+            $normal = features_get_signature('normal', $feature, $component, $reset);
+            $default = features_get_signature('default', $feature, $component, $reset);
+            $codecache = features_get_signature('cache', $feature, $component, $reset);
+            $semaphore = features_semaphore('get', $component);
 
-          // DB and code states match, there is nothing more to check.
-          if ($normal == $default) {
+            // DB and code states match, there is nothing more to check.
+            if ($normal == $default) {
             $cache[$feature][$component] = FEATURES_DEFAULT;
 
             // Stale semaphores can be deleted.
@@ -754,73 +754,73 @@ 
 
             // Update code cache if it is stale, clear out semaphore if it stale.
             if ($default != $codecache) {
-              features_set_signature($feature, $component, $default);
+                features_set_signature($feature, $component, $default);
+            }
             }
-          }
-          // Component properly implements exportables.
-          else if (!features_hook($component, 'features_rebuild')) {
+            // Component properly implements exportables.
+            else if (!features_hook($component, 'features_rebuild')) {
             $cache[$feature][$component] = FEATURES_OVERRIDDEN;
-          }
-          // Component does not implement exportables.
-          else {
+            }
+            // Component does not implement exportables.
+            else {
             if (empty($semaphore)) {
-              // Exception for dependencies. Dependencies are always rebuildable.
-              if ($component === 'dependencies') {
+                // Exception for dependencies. Dependencies are always rebuildable.
+                if ($component === 'dependencies') {
                 $cache[$feature][$component] = FEATURES_REBUILDABLE;
-              }
-              // All other rebuildable components require comparison.
-              else {
+                }
+                // All other rebuildable components require comparison.
+                else {
                 // Code has not changed, but DB does not match. User has DB overrides.
                 if ($codecache == $default) {
-                  $cache[$feature][$component] = FEATURES_OVERRIDDEN;
+                    $cache[$feature][$component] = FEATURES_OVERRIDDEN;
                 }
                 // DB has no modifications to prior code state (or this is initial install).
                 else if (empty($codecache) || $codecache == $normal) {
-                  $cache[$feature][$component] = FEATURES_REBUILDABLE;
+                    $cache[$feature][$component] = FEATURES_REBUILDABLE;
                 }
                 // None of the states match. Requires user intervention.
                 else if ($codecache != $default) {
-                  $cache[$feature][$component] = FEATURES_NEEDS_REVIEW;
+                    $cache[$feature][$component] = FEATURES_NEEDS_REVIEW;
+                }
                 }
-              }
             }
             else {
-              // Semaphore is still within processing horizon. Do nothing.
-              if ((time() - $semaphore) < FEATURES_SEMAPHORE_TIMEOUT) {
+                // Semaphore is still within processing horizon. Do nothing.
+                if ((time() - $semaphore) < FEATURES_SEMAPHORE_TIMEOUT) {
                 $cache[$feature][$component] = FEATURES_REBUILDING;
-              }
-              // A stale semaphore means a previous rebuild attempt did not complete.
-              // Attempt to complete the rebuild.
-              else {
+                }
+                // A stale semaphore means a previous rebuild attempt did not complete.
+                // Attempt to complete the rebuild.
+                else {
                 $cache[$feature][$component] = FEATURES_REBUILDABLE;
-              }
+                }
+            }
             }
-          }
         }
-      }
+        }
+    }
     }
-  }
 
-  // Filter cached components on the way out to ensure that even if we have
-  // cached more data than has been requested, the return value only reflects
-  // the requested features/components.
-  $return = $cache;
-  $return = array_intersect_key($return, array_flip($features));
-  foreach ($return as $k => $v) {
+    // Filter cached components on the way out to ensure that even if we have
+    // cached more data than has been requested, the return value only reflects
+    // the requested features/components.
+    $return = $cache;
+    $return = array_intersect_key($return, array_flip($features));
+    foreach ($return as $k => $v) {
     $return[$k] = array_intersect_key($return[$k], array_flip($components));
-  }
-  return $return;
+    }
+    return $return;
 }
 
 /**
  * Helper function to eliminate whitespace differences in code.
  */
 function _features_linetrim($code) {
-  $code = explode("\n", $code);
-  foreach ($code as $k => $line) {
+    $code = explode("\n", $code);
+    foreach ($code as $k => $line) {
     $code[$k] = trim($line);
-  }
-  return implode("\n", $code);
+    }
+    return implode("\n", $code);
 }
 
 /**
@@ -829,19 +829,19 @@ 
  * - Remove any null or empty values for associative arrays (array_filter()).
  */
 function _features_sanitize(&$array) {
-  if (is_array($array)) {
+    if (is_array($array)) {
     $is_assoc = (array_keys($array) !== range(0, count($array) - 1));
     if ($is_assoc) {
-      ksort($array);
-      $array = array_filter($array);
+        ksort($array);
+        $array = array_filter($array);
     }
     else {
-      sort($array);
+        sort($array);
     }
     foreach ($array as $k => $v) {
-      if (is_array($v)) {
+        if (is_array($v)) {
         _features_sanitize($array[$k]);
-      }
+        }
+    }
     }
-  }
 }

drupal/sites/default/boinc/modules/contrib/features/features.admin.inc

Indentation +338 added lines, -338 removed lines

@@ -4,26 +4,26 @@ 
  * Form callback for features export form. Acts as a router based on the form_state.
  */
 function features_export_form($form_state, $feature = NULL) {
-  module_load_include('inc', 'features', 'features.export');
-  features_include();
+    module_load_include('inc', 'features', 'features.export');
+    features_include();
 
-  $form = array(
+    $form = array(
     '#attributes' => array('class' => 'features-export-form'),
     '#feature' => isset($feature) ? $feature : NULL,
-  );
-  $form['info'] = array(
+    );
+    $form['info'] = array(
     '#type' => 'fieldset',
     '#tree' => FALSE,
-  );
-  $form['info']['name'] = array(
+    );
+    $form['info']['name'] = array(
     '#title' => t('Name'),
     '#description' => t('Example: Image gallery'),
     '#type' => 'textfield',
     '#required' => TRUE,
     '#default_value' => !empty($feature->info['name']) ? $feature->info['name'] : '',
     '#attributes' => array('class' => 'feature-name'),
-  );
-  $form['info']['module_name'] = array(
+    );
+    $form['info']['module_name'] = array(
     '#type' => 'textfield',
     '#title' => t('Machine-readable name'),
     '#description' => t('Example: image_gallery'). '<br/>' .t('May only contain lowercase letters, numbers and underscores. <strong>Try to avoid conflicts with the names of existing Drupal projects.</strong>'),
@@ -31,22 +31,22 @@ 
     '#default_value' => !empty($feature->name) ? $feature->name : '',
     '#attributes' => array('class' => 'feature-module-name'),
     '#element_validate' => array('features_export_form_validate_field'),
-  );
-  // If recreating this feature, disable machine name field and blank out
-  // js-attachment classes to ensure the machine name cannot be changed.
-  if (isset($feature)) {
+    );
+    // If recreating this feature, disable machine name field and blank out
+    // js-attachment classes to ensure the machine name cannot be changed.
+    if (isset($feature)) {
     $form['info']['module_name']['#value'] = $feature->name;
     $form['info']['module_name']['#disabled'] = TRUE;
     $form['info']['name']['#attributes'] = array();
-  }
-  $form['info']['description'] = array(
+    }
+    $form['info']['description'] = array(
     '#title' => t('Description'),
     '#description' => t('Provide a short description of what users should expect when they enable your feature.'),
     '#type' => 'textfield',
     '#required' => TRUE,
     '#default_value' => !empty($feature->info['description']) ? $feature->info['description'] : '',
-  );
-  $form['info']['version'] = array(
+    );
+    $form['info']['version'] = array(
     '#title' => t('Version'),
     '#description' => t('Examples: 6.x-1.0, 6.x-1.0-beta1'),
     '#type' => 'textfield',
@@ -54,8 +54,8 @@ 
     '#default_value' => !empty($feature->info['version']) ? $feature->info['version'] : '',
     '#size' => 30,
     '#element_validate' => array('features_export_form_validate_field'),
-  );
-  $form['info']['project_status_url'] = array(
+    );
+    $form['info']['project_status_url'] = array(
     '#title' => t('URL of update XML'),
     '#description' => t('Example: http://mywebsite.com/fserver'),
     '#type' => 'textfield',
@@ -63,168 +63,168 @@ 
     '#default_value' => !empty($feature->info['project status url']) ? $feature->info['project status url'] : '',
     '#size' => 30,
     '#element_validate' => array('features_export_form_validate_field'),
-  );
+    );
 
-  // User-selected feature source components.
-  $components = features_get_components();
-  uasort($components, 'features_compare_component_name');
+    // User-selected feature source components.
+    $components = features_get_components();
+    uasort($components, 'features_compare_component_name');
 
-  $form['export'] = array(
+    $form['export'] = array(
     '#type' => 'fieldset',
     '#tree' => FALSE,
     '#theme' => 'features_form_export',
-  );
-  $form['export']['components'] = array(
+    );
+    $form['export']['components'] = array(
     '#title' => t('Edit components'),
     '#type' => 'select',
     '#options' => array('------'),
     '#attributes' => array('class' => 'features-select-components'),
-  );
-  $form['export']['sources'] = array(
+    );
+    $form['export']['sources'] = array(
     '#tree' => TRUE,
     '#theme' => 'features_form_components',
-  );
-  foreach ($components as $component => $component_info) {
+    );
+    foreach ($components as $component => $component_info) {
     $options = features_invoke($component, 'features_export_options');
     if ($component === 'dependencies') {
-      $default_value = !empty($feature->info['dependencies']) ? $feature->info['dependencies'] : array();
+        $default_value = !empty($feature->info['dependencies']) ? $feature->info['dependencies'] : array();
     }
     else {
-      $default_value = !empty($feature->info['features'][$component]) ? $feature->info['features'][$component] : array();
+        $default_value = !empty($feature->info['features'][$component]) ? $feature->info['features'][$component] : array();
     }
     if ($options) {
-      // Find all default components that are not provided by this feature and
-      // strip them out of the possible options.
-      if ($map = features_get_default_map($component)) {
+        // Find all default components that are not provided by this feature and
+        // strip them out of the possible options.
+        if ($map = features_get_default_map($component)) {
         foreach ($map as $k => $v) {
-          if (isset($options[$k]) && (!isset($feature->name) || $v !== $feature->name)) {
+            if (isset($options[$k]) && (!isset($feature->name) || $v !== $feature->name)) {
             unset($options[$k]);
-          }
+            }
         }
-      }
-      // Ensure all options are stripped of potentially bad values.
-      foreach ($options as $k => $v) {
+        }
+        // Ensure all options are stripped of potentially bad values.
+        foreach ($options as $k => $v) {
         $options[$k] = check_plain($v);
-      }
-      $label = (isset($component_info['name']) ? $component_info['name'] . ": " . $component : $component);
-      $form['export']['components']['#options'][$component] = $label;
-      if (!empty($options)) {
+        }
+        $label = (isset($component_info['name']) ? $component_info['name'] . ": " . $component : $component);
+        $form['export']['components']['#options'][$component] = $label;
+        if (!empty($options)) {
         $form['export']['sources'][$component] = array(
-          '#type' => 'checkboxes',
-          '#options' => features_dom_encode_options($options),
-          '#title' => $component,
-          '#default_value' => features_dom_encode_options($default_value, FALSE),
-          '#ahah' => array(
+            '#type' => 'checkboxes',
+            '#options' => features_dom_encode_options($options),
+            '#title' => $component,
+            '#default_value' => features_dom_encode_options($default_value, FALSE),
+            '#ahah' => array(
             'path' => 'admin/build/features/export/populate',
             'wrapper' => 'features-export-populated',
-          ),
+            ),
         );
-      }
-      else {
+        }
+        else {
         $form['export']['sources'][$component] = array(
-          '#type' => 'item',
-          '#title' => $component,
-          '#value' => t('All components of this type are exported by other features or modules.'),
+            '#type' => 'item',
+            '#title' => $component,
+            '#value' => t('All components of this type are exported by other features or modules.'),
         );
-      }
+        }
+    }
     }
-  }
-  $form['export']['features'] = array(
+    $form['export']['features'] = array(
     '#tree' => TRUE,
     '#type' => 'markup',
     '#prefix' => "<div id='features-export-populated'>",
     '#suffix' => "</div>",
     '#value' => !empty($feature->info) ? theme('features_components', $feature->info, $feature->info['features']) : "<div class='placeholder'></div>",
-  );
+    );
 
-  $form['buttons'] = array('#theme' => 'features_form_buttons', '#tree' => FALSE);
-  $form['buttons']['submit'] = array(
+    $form['buttons'] = array('#theme' => 'features_form_buttons', '#tree' => FALSE);
+    $form['buttons']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Download feature'),
     '#weight' => 10,
     '#submit' => array('features_export_build_form_submit'),
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * Validation for project field.
  */
 function features_export_form_validate_field($element, &$form_state) {
-  switch ($element['#name']) {
+    switch ($element['#name']) {
     case 'module_name':
       if (!preg_match('!^[a-z0-9_]+$!', $element['#value'])) {
         form_error($element, t('The machine-readable name must contain only lowercase letters, numbers, and underscores.'));
-      }
-      // If user is filling out the feature name for the first time and uses
-      // the name of an existing module throw an error.
-      else if (empty($element['#default_value']) && features_get_info('module', $element['#value'])) {
+        }
+        // If user is filling out the feature name for the first time and uses
+        // the name of an existing module throw an error.
+        else if (empty($element['#default_value']) && features_get_info('module', $element['#value'])) {
         form_error($element, t('A module by the name @name already exists on your site. Please choose a different name.', array('@name' => $element['#value'])));
-      }
-      break;
+        }
+        break;
     case 'project_status_url':
       if (!empty($element['#value']) && !valid_url($element['#value'])) {
         form_error($element, t('The URL %url is invalid. Please enter a fully-qualified URL, such as http://www.example.com/feed.xml.', array('%url' => $element['#value'])));
-      }
-      break;
+        }
+        break;
     case 'version':
       preg_match('/^(?P<core>\d+\.x)-(?P<major>\d+)\.(?P<patch>\d+)-?(?P<extra>\w+)?$/', $element['#value'], $matches);
-      if (!empty($element['#value']) && !isset($matches['core'], $matches['major'])) {
+        if (!empty($element['#value']) && !isset($matches['core'], $matches['major'])) {
         form_error($element, t('Please enter a valid version with core and major version number. Example: !example', array('!example' => '6.x-1.0')));
-      };
-      break;
-  }
+        };
+        break;
+    }
 }
 
 /**
  * Submit handler for features_export_form_build().
  */
 function features_export_build_form_submit($form, &$form_state) {
-  module_load_include('inc', 'features', 'features.export');
-  features_include();
+    module_load_include('inc', 'features', 'features.export');
+    features_include();
 
-  // Assemble the combined component list
-  $stub = array();
-  $components = array_keys(features_get_components());
-  foreach ($components as $component) {
+    // Assemble the combined component list
+    $stub = array();
+    $components = array_keys(features_get_components());
+    foreach ($components as $component) {
     // User-selected components take precedence.
     if (!empty($form_state['values']['sources'][$component])) {
-      $stub[$component] = features_dom_decode_options(array_filter($form_state['values']['sources'][$component]));
+        $stub[$component] = features_dom_decode_options(array_filter($form_state['values']['sources'][$component]));
     }
     // Only fallback to an existing feature's values if there are no export options for the component.
     else if (!empty($form['#feature']->info['features'][$component])) {
-      $stub[$component] = $form['#feature']->info['features'][$component];
+        $stub[$component] = $form['#feature']->info['features'][$component];
+    }
     }
-  }
 
-  // Generate populated feature
-  $module_name = $form_state['values']['module_name'];
-  $export = features_populate($stub, $form_state['values']['sources']['dependencies'], $module_name);
+    // Generate populated feature
+    $module_name = $form_state['values']['module_name'];
+    $export = features_populate($stub, $form_state['values']['sources']['dependencies'], $module_name);
 
-  // Directly copy the following attributes
-  $attr = array('name', 'description');
-  foreach ($attr as $key) {
+    // Directly copy the following attributes
+    $attr = array('name', 'description');
+    foreach ($attr as $key) {
     $export[$key] = isset($form_state['values'][$key]) ? $form_state['values'][$key] : NULL;
-  }
-  // If either update status-related keys are provided, add a project key
-  // corresponding to the module name.
-  if (!empty($form_state['values']['version']) || !empty($form_state['values']['project_status_url'])) {
+    }
+    // If either update status-related keys are provided, add a project key
+    // corresponding to the module name.
+    if (!empty($form_state['values']['version']) || !empty($form_state['values']['project_status_url'])) {
     $export['project'] = $form_state['values']['module_name'];
-  }
-  if (!empty($form_state['values']['version'])) {
+    }
+    if (!empty($form_state['values']['version'])) {
     $export['version'] = $form_state['values']['version'];
-  }
-  if (!empty($form_state['values']['project_status_url'])) {
+    }
+    if (!empty($form_state['values']['project_status_url'])) {
     $export['project status url'] = $form_state['values']['project_status_url'];
-  }
+    }
 
-  // Generate download
-  if ($files = features_export_render($export, $module_name, TRUE)) {
+    // Generate download
+    if ($files = features_export_render($export, $module_name, TRUE)) {
     $filename = (!empty($export['version']) ? "{$module_name}-{$export['version']}" : $module_name) . '.tar';
 
     // Clear out output buffer to remove any garbage from tar output.
     if (ob_get_level()) {
-      ob_end_clean();
+        ob_end_clean();
     }
 
     drupal_set_header('Content-type: application/x-tar');
@@ -233,62 +233,62 @@ 
     $tar = array();
     $filenames = array();
     foreach ($files as $extension => $file_contents) {
-      if (!in_array($extension, array('module', 'info'))) {
+        if (!in_array($extension, array('module', 'info'))) {
         $extension .= '.inc';
-      }
-      $filenames[] = "{$module_name}.$extension";
-      print features_tar_create("{$module_name}/{$module_name}.$extension", $file_contents);
+        }
+        $filenames[] = "{$module_name}.$extension";
+        print features_tar_create("{$module_name}/{$module_name}.$extension", $file_contents);
     }
     if (features_get_modules($module_name, TRUE)) {
-      $module_path = drupal_get_path('module', $module_name);
-      // file_scan_directory() can throw warnings when using PHP 5.3, messing
-      // up the output of our file stream. Suppress errors in this one case in
-      // order to produce valid output.
-      foreach (@file_scan_directory($module_path, '.*') as $file) {
+        $module_path = drupal_get_path('module', $module_name);
+        // file_scan_directory() can throw warnings when using PHP 5.3, messing
+        // up the output of our file stream. Suppress errors in this one case in
+        // order to produce valid output.
+        foreach (@file_scan_directory($module_path, '.*') as $file) {
         $filename = substr($file->filename, strlen($module_path) + 1);
         if (!in_array($filename, $filenames)) {
-          // Add this file.
-          $contents = file_get_contents($file->filename);
-          print features_tar_create("{$module_name}/{$filename}", $contents);
-          unset($contents);
+            // Add this file.
+            $contents = file_get_contents($file->filename);
+            print features_tar_create("{$module_name}/{$filename}", $contents);
+            unset($contents);
+        }
         }
-      }
     }
     print pack("a1024","");
     exit;
-  }
+    }
 }
 
 /**
  * AHAH handler for features_export_form_build().
  */
 function features_export_build_form_populate() {
-  module_load_include('inc', 'features', 'features.export');
-  features_include();
+    module_load_include('inc', 'features', 'features.export');
+    features_include();
 
-  $form_state = array();
-  $submitted = $_POST;
+    $form_state = array();
+    $submitted = $_POST;
 
-  if ($form = form_get_cache($submitted['form_build_id'], $form_state)) {
+    if ($form = form_get_cache($submitted['form_build_id'], $form_state)) {
     $stub = array();
 
     // Assemble the combined component list
     $components = array_keys(features_get_components());
     foreach ($components as $component) {
-      // User-selected components take precedence.
-      if (!empty($submitted['sources'][$component])) {
+        // User-selected components take precedence.
+        if (!empty($submitted['sources'][$component])) {
         // Validate and set the default value for each selected option. This
         foreach ($submitted['sources'][$component] as $key => $value) {
-          if (isset($form['export']['sources'][$component]['#options'][$key])) {
+            if (isset($form['export']['sources'][$component]['#options'][$key])) {
             $form['export']['sources'][$component]['#default_value'][$key] = $value;
-          }
+            }
         }
         $stub[$component] = features_dom_decode_options(array_filter($submitted['sources'][$component]));
-      }
-      // Only fallback to an existing feature's values if there are no export options for the component.
-      else if (!isset($form['export']['sources'][$component]) && !empty($form['#feature']->info['features'][$component])) {
+        }
+        // Only fallback to an existing feature's values if there are no export options for the component.
+        else if (!isset($form['export']['sources'][$component]) && !empty($form['#feature']->info['features'][$component])) {
         $stub[$component] = $form['#feature']->info['features'][$component];
-      }
+        }
     }
 
     // Assemble dependencies
@@ -308,59 +308,59 @@ 
 
     drupal_json(array('status' => TRUE, 'data' => $components_rendered . theme('status_messages')));
     exit;
-  }
-  drupal_json(array('status' => FALSE, 'data' => ''));
-  exit;
+    }
+    drupal_json(array('status' => FALSE, 'data' => ''));
+    exit;
 }
 
 /**
  * admin/build/features page callback.
  */
 function features_admin_form($form_state) {
-  // Load export functions to use in comparison.
-  module_load_include('inc', 'features', 'features.export');
+    // Load export functions to use in comparison.
+    module_load_include('inc', 'features', 'features.export');
 
-  // Clear & rebuild key caches
-  module_rebuild_cache();
-  features_rebuild();
+    // Clear & rebuild key caches
+    module_rebuild_cache();
+    features_rebuild();
 
-  features_get_info(NULL, NULL, TRUE);
-  $modules = features_get_modules();
-  $features = features_get_features();
-  $conflicts = features_get_conflicts();
+    features_get_info(NULL, NULL, TRUE);
+    $modules = features_get_modules();
+    $features = features_get_features();
+    $conflicts = features_get_conflicts();
 
-  foreach ($modules as $key => $module) {
+    foreach ($modules as $key => $module) {
     if ($module->status && !empty($module->info['dependencies'])) {
-      foreach ($module->info['dependencies'] as $dependent) {
+        foreach ($module->info['dependencies'] as $dependent) {
         if (isset($features[$dependent])) {
-          $features[$dependent]->dependents[$key] = $module->info['name'];
+            $features[$dependent]->dependents[$key] = $module->info['name'];
+        }
         }
-      }
     }
-  }
+    }
 
-  $form = array(
+    $form = array(
     '#features' => $features,
     '#theme' => 'features_form',
-  );
+    );
 
-  // Generate features form.
-  foreach ($features as $name => $module) {
+    // Generate features form.
+    foreach ($features as $name => $module) {
     $package_title = !empty($module->info['package']) ? $module->info['package'] : t('Other');
     $package = strtolower(preg_replace('/[^a-zA-Z0-9-]+/', '-', $package_title));
 
     // Set up package elements
     if (!isset($form[$package])) {
-      $form[$package] = array(
+        $form[$package] = array(
         '#tree' => FALSE,
         '#title' => t($package_title),
         '#theme' => 'features_form_package'
-      );
-      $form[$package]['links'] =
-      $form[$package]['version'] =
-      $form[$package]['weight'] =
-      $form[$package]['status'] =
-      $form[$package]['action'] = array('#tree' => TRUE);
+        );
+        $form[$package]['links'] =
+        $form[$package]['version'] =
+        $form[$package]['weight'] =
+        $form[$package]['status'] =
+        $form[$package]['action'] = array('#tree' => TRUE);
     }
 
     $disabled = FALSE;
@@ -368,238 +368,238 @@ 
 
     // Detect unmet dependencies
     if (!empty($module->info['dependencies'])) {
-      $unmet_dependencies = array();
-      $dependencies = _features_export_maximize_dependencies($module->info['dependencies']);
-      foreach ($dependencies as $dependency) {
+        $unmet_dependencies = array();
+        $dependencies = _features_export_maximize_dependencies($module->info['dependencies']);
+        foreach ($dependencies as $dependency) {
         if (empty($modules[$dependency])) {
-          $unmet_dependencies[] = theme('features_module_status', FEATURES_MODULE_MISSING, $dependency);
+            $unmet_dependencies[] = theme('features_module_status', FEATURES_MODULE_MISSING, $dependency);
         }
-      }
-      if (!empty($unmet_dependencies)) {
+        }
+        if (!empty($unmet_dependencies)) {
         $description .= "<div class='dependencies'>". t('Unmet dependencies: !dependencies', array('!dependencies' => implode(', ', $unmet_dependencies))) ."</div>";
         $disabled = TRUE;
-      }
+        }
     }
 
     if (!empty($module->dependents)) {
-      $disabled = TRUE;
-      $description .= "<div class='requirements'>". t('Required by: !dependents', array('!dependents' => implode(', ', $module->dependents))) ."</div>";
+        $disabled = TRUE;
+        $description .= "<div class='requirements'>". t('Required by: !dependents', array('!dependents' => implode(', ', $module->dependents))) ."</div>";
     }
 
     // Detect potential conflicts
     if (!empty($conflicts[$name])) {
-      $module_conflicts = array();
-      foreach (array_keys($conflicts[$name]) as $conflict) {
+        $module_conflicts = array();
+        foreach (array_keys($conflicts[$name]) as $conflict) {
         $module_conflicts[] = theme('features_module_status', FEATURES_MODULE_MISSING, $conflict);
         // Only disable modules with conflicts if they are not already enabled.
         // If they are already enabled, somehow the user got themselves into a
         // bad situation and they need to be able to disable a conflicted module.
         if (module_exists($conflict) && !module_exists($name)) {
-          $disabled = TRUE;
+            $disabled = TRUE;
         }
-      }
-      $description .= "<div class='conflicts'>". t('Conflicts with: !conflicts', array('!conflicts' => implode(', ', $module_conflicts))) ."</div>";
+        }
+        $description .= "<div class='conflicts'>". t('Conflicts with: !conflicts', array('!conflicts' => implode(', ', $module_conflicts))) ."</div>";
     }
 
     $form[$package]['status'][$name] = array(
-      '#type' => 'checkbox',
-      '#title' => $module->info['name'],
-      '#description' => $description,
-      '#default_value' => $module->status,
-      '#disabled' => $disabled,
+        '#type' => 'checkbox',
+        '#title' => $module->info['name'],
+        '#description' => $description,
+        '#default_value' => $module->status,
+        '#disabled' => $disabled,
     );
 
     if (!empty($module->info['project status url'])) {
-      $uri = l(truncate_utf8($module->info['project status url'], 35, TRUE, TRUE), $module->info['project status url']);
+        $uri = l(truncate_utf8($module->info['project status url'], 35, TRUE, TRUE), $module->info['project status url']);
     }
     else if (isset($module->info['project'], $module->info['version'], $module->info['datestamp'])) {
-      $uri = l('http://drupal.org', 'http://drupal.org/project/'. $module->info['project']);
+        $uri = l('http://drupal.org', 'http://drupal.org/project/'. $module->info['project']);
     }
     else {
-      $uri = t('Unavailable');
+        $uri = t('Unavailable');
     }
     $version = !empty($module->info['version']) ? $module->info['version'] : '';
     $version = !empty($version) ? "<div class='description'>$version</div>" : '';
     $form[$package]['sign'][$name] = array('#type' => 'markup', '#value' => "{$uri} {$version}");
 
     if (user_access('administer features')) {
-      // Add status link
-      $href = "admin/build/features/{$name}";
-      if ($module->status) {
+        // Add status link
+        $href = "admin/build/features/{$name}";
+        if ($module->status) {
         $state = '<span class="admin-loading features-storage">' . t('Checking...') . '</span>';
         $state .= l(t('Check'), "admin/build/features/{$name}/status", array('attributes' => array('class' => 'admin-check')));
         $state .= theme('features_storage_link', FEATURES_REBUILDING, NULL, $href);
         $state .= theme('features_storage_link', FEATURES_NEEDS_REVIEW, NULL, $href);
         $state .= theme('features_storage_link', FEATURES_OVERRIDDEN, NULL, $href);
         $state .= theme('features_storage_link', FEATURES_DEFAULT, NULL, $href);
-      }
-      elseif (!empty($conflicts[$name])) {
+        }
+        elseif (!empty($conflicts[$name])) {
         $state = theme('features_storage_link', FEATURES_CONFLICT, NULL, $href);
-      }
-      else {
+        }
+        else {
         $state = theme('features_storage_link', FEATURES_DISABLED, NULL, $href);
-      }
-      $form[$package]['state'][$name] = array(
+        }
+        $form[$package]['state'][$name] = array(
         '#type' => 'markup',
         '#value' => !empty($state) ? $state : '',
-      );
+        );
 
-      // Add in recreate link
-      $form[$package]['actions'][$name] = array(
+        // Add in recreate link
+        $form[$package]['actions'][$name] = array(
         '#type' => 'markup',
         '#value' => l(t('Recreate'), "admin/build/features/{$name}/recreate", array('attributes' => array('class' => 'admin-update'))),
-      );
+        );
+    }
     }
-  }
 
-  $form['buttons'] = array(
+    $form['buttons'] = array(
     '#theme' => 'features_form_buttons',
-  );
-  $form['buttons']['submit'] = array(
+    );
+    $form['buttons']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save settings'),
     '#submit' => array('features_form_submit'),
     '#validate' => array('features_form_validate'),
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * Display the components of a feature.
  */
 function features_admin_components($form_state, $feature) {
-  module_load_include('inc', 'features', 'features.export');
-  $form = array();
-
-  // Store feature info for theme layer.
-  $form['module'] = array('#type' => 'value', '#value' => $feature->name);
-  $form['#info'] = $feature->info;
-  $form['#dependencies'] = array();
-  if (!empty($feature->info['dependencies'])) {
+    module_load_include('inc', 'features', 'features.export');
+    $form = array();
+
+    // Store feature info for theme layer.
+    $form['module'] = array('#type' => 'value', '#value' => $feature->name);
+    $form['#info'] = $feature->info;
+    $form['#dependencies'] = array();
+    if (!empty($feature->info['dependencies'])) {
     foreach ($feature->info['dependencies'] as $dependency) {
-      $status = features_get_module_status($dependency);
-      $form['#dependencies'][$dependency] = $status;
+        $status = features_get_module_status($dependency);
+        $form['#dependencies'][$dependency] = $status;
+    }
     }
-  }
 
-  $review = $revert = FALSE;
+    $review = $revert = FALSE;
 
-  // Iterate over components and retrieve status for display
-  $states = features_get_component_states(array($feature->name), FALSE);
-  $form['revert']['#tree'] = TRUE;
-  foreach ($feature->info['features'] as $component => $items) {
+    // Iterate over components and retrieve status for display
+    $states = features_get_component_states(array($feature->name), FALSE);
+    $form['revert']['#tree'] = TRUE;
+    foreach ($feature->info['features'] as $component => $items) {
     if (user_access('administer features') && in_array($states[$feature->name][$component], array(FEATURES_OVERRIDDEN, FEATURES_NEEDS_REVIEW))) {
-      switch ($states[$feature->name][$component]) {
+        switch ($states[$feature->name][$component]) {
         case FEATURES_OVERRIDDEN:
           $revert = TRUE;
-          break;
+            break;
         case FEATURES_NEEDS_REVIEW:
           $review = TRUE;
-          break;
-      }
-      $form['revert'][$component] = array(
+            break;
+        }
+        $form['revert'][$component] = array(
         '#type' => 'checkbox',
         '#default_value' => FALSE,
-      );
+        );
     }
     if (module_exists('diff')) {
-      $item = menu_get_item("admin/build/features/{$feature->name}/diff/{$component}");
-      $path = ($item && $item['access']) ? $item['href'] : NULL;
+        $item = menu_get_item("admin/build/features/{$feature->name}/diff/{$component}");
+        $path = ($item && $item['access']) ? $item['href'] : NULL;
     }
     else {
-      $path = NULL;
+        $path = NULL;
     }
     $form['components'][$component] = array(
-      '#type' => 'markup',
-      '#value' => theme('features_storage_link', $states[$feature->name][$component], NULL, $path),
+        '#type' => 'markup',
+        '#value' => theme('features_storage_link', $states[$feature->name][$component], NULL, $path),
     );
-  }
+    }
 
-  if ($review || $revert) {
+    if ($review || $revert) {
     $form['buttons'] = array('#theme' => 'features_form_buttons', '#tree' => TRUE);
     if ($revert || $review) {
-      $form['buttons']['revert'] = array(
+        $form['buttons']['revert'] = array(
         '#type' => 'submit',
         '#value' => t('Revert components'),
         '#submit' => array('features_admin_components_revert'),
-      );
+        );
     }
     if ($review) {
-      $form['buttons']['review'] = array(
+        $form['buttons']['review'] = array(
         '#type' => 'submit',
         '#value' => t('Mark as reviewed'),
         '#submit' => array('features_admin_components_review'),
-      );
+        );
     }
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
  * Submit handler for revert form.
  */
 function features_admin_components_revert(&$form, &$form_state) {
-  module_load_include('inc', 'features', 'features.export');
-  features_include();
-  $module = $form_state['values']['module'];
-  $revert = array();
-  foreach (array_filter($form_state['values']['revert']) as $component => $status) {
+    module_load_include('inc', 'features', 'features.export');
+    features_include();
+    $module = $form_state['values']['module'];
+    $revert = array();
+    foreach (array_filter($form_state['values']['revert']) as $component => $status) {
     $revert[$module][] = $component;
     drupal_set_message(t('Reverted all <strong>!component</strong> components for <strong>!module</strong>.', array('!component' => $component, '!module' => $module)));
-  }
-  features_revert($revert);
-  $form_state['redirect'] = 'admin/build/features/'. $module;
+    }
+    features_revert($revert);
+    $form_state['redirect'] = 'admin/build/features/'. $module;
 }
 
 /**
  * Submit handler for revert form.
  */
 function features_admin_components_review(&$form, &$form_state) {
-  module_load_include('inc', 'features', 'features.export');
-  features_include();
-  $module = $form_state['values']['module'];
-  $revert = array();
-  foreach (array_filter($form_state['values']['revert']) as $component => $status) {
+    module_load_include('inc', 'features', 'features.export');
+    features_include();
+    $module = $form_state['values']['module'];
+    $revert = array();
+    foreach (array_filter($form_state['values']['revert']) as $component => $status) {
     features_set_signature($module, $component);
     drupal_set_message(t('All <strong>!component</strong> components for <strong>!module</strong> reviewed.', array('!component' => $component, '!module' => $module)));
-  }
-  $form_state['redirect'] = 'admin/build/features/'. $module;
+    }
+    $form_state['redirect'] = 'admin/build/features/'. $module;
 }
 
 /**
  * Validate handler for the 'manage features' form.
  */
 function features_form_validate(&$form, &$form_state) {
-  include_once './includes/install.inc';
-  $conflicts = features_get_conflicts();
-  foreach ($form_state['values']['status'] as $module => $status) {
+    include_once './includes/install.inc';
+    $conflicts = features_get_conflicts();
+    foreach ($form_state['values']['status'] as $module => $status) {
     if ($status) {
-      if (!empty($conflicts[$module])) {
+        if (!empty($conflicts[$module])) {
         foreach (array_keys($conflicts[$module]) as $conflict) {
-          if (!empty($form_state['values']['status'][$conflict])) {
+            if (!empty($form_state['values']['status'][$conflict])) {
             form_set_error('status', t('The feature !module cannot be enabled because it conflicts with !conflict.', array('!module' => $module, '!conflict' => $conflict)));
-          }
+            }
+        }
         }
-      }
-      if (!drupal_check_module($module)) {
+        if (!drupal_check_module($module)) {
         form_set_error('status', t('The feature !module cannot be enabled because it has unmet requirements.', array('!module' => $module, '!conflict' => $conflict)));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Submit handler for the 'manage features' form
  */
 function features_form_submit(&$form, &$form_state) {
-  // Clear drupal caches after enabling a feature. We do this in a separate
-  // page callback rather than as part of the submit handler as some modules
-  // have includes/other directives of importance in hooks that have already
-  // been called in this page load.
-  $form_state['redirect'] = array('admin/build/features/cleanup/clear', array('token' => drupal_get_token()));
-
-  $features = $form['#features'];
-  if (!empty($features)) {
+    // Clear drupal caches after enabling a feature. We do this in a separate
+    // page callback rather than as part of the submit handler as some modules
+    // have includes/other directives of importance in hooks that have already
+    // been called in this page load.
+    $form_state['redirect'] = array('admin/build/features/cleanup/clear', array('token' => drupal_get_token()));
+
+    $features = $form['#features'];
+    if (!empty($features)) {
     $status = $form_state['values']['status'];
     $install = array_keys(array_filter($status));
     $disable = array_diff(array_keys($status), $install);
@@ -609,17 +609,17 @@ 
     // be re-enabled.
     module_disable($disable);
     features_install_modules($install);
-  }
+    }
 }
 
 /**
  * Form for disabling orphaned dependencies.
  */
 function features_cleanup_form($form_state, $cache_clear = FALSE) {
-  $form = array();
+    $form = array();
 
-  // Clear caches if we're getting a post-submit redirect that requests it.
-  if ($cache_clear && !empty($_GET['token']) && drupal_valid_token($_GET['token'])) {
+    // Clear caches if we're getting a post-submit redirect that requests it.
+    if ($cache_clear && !empty($_GET['token']) && drupal_valid_token($_GET['token'])) {
     drupal_flush_all_caches();
 
     // The following functions need to be run because drupal_flush_all_caches()
@@ -627,52 +627,52 @@ 
     // the menu is rebuilt, meaning that the menu tree is stale in certain
     // circumstances after drupal_flush_all_caches(). We rebuild again.
     menu_rebuild();
-  }
-
-  // Retrieve orphaned modules and provide them as optional modules to be disabled.
-  // Exclude any modules that have been added to the 'ignored' list.
-  $options = array();
-  $orphans = features_get_orphans();
-  $ignored = variable_get('features_ignored_orphans', array());
-  if (!empty($orphans)) {
+    }
+
+    // Retrieve orphaned modules and provide them as optional modules to be disabled.
+    // Exclude any modules that have been added to the 'ignored' list.
+    $options = array();
+    $orphans = features_get_orphans();
+    $ignored = variable_get('features_ignored_orphans', array());
+    if (!empty($orphans)) {
     foreach ($orphans as $module) {
-      if (!in_array($module->name, $ignored, TRUE)) {
+        if (!in_array($module->name, $ignored, TRUE)) {
         $options[$module->name] = check_plain($module->info['name']);
-      }
+        }
+    }
     }
-  }
 
-  if (!empty($options)) {
+    if (!empty($options)) {
     $form['orphans'] = array(
-      '#title' => t('Orphaned dependencies'),
-      '#description' => t('These modules are dependencies of features that have been disabled. They may be disabled without affecting other components of your website.'),
-      '#type' => 'checkboxes',
-      '#options' => $options,
-      '#default_value' => array_keys($options),
+        '#title' => t('Orphaned dependencies'),
+        '#description' => t('These modules are dependencies of features that have been disabled. They may be disabled without affecting other components of your website.'),
+        '#type' => 'checkboxes',
+        '#options' => $options,
+        '#default_value' => array_keys($options),
     );
     $form['buttons'] = array('#tree' => TRUE, '#theme' => 'features_form_buttons');
     $form['buttons']['disable'] = array(
-      '#type' => 'submit',
-      '#value' => t('Disable selected modules'),
-      '#submit' => array('features_cleanup_form_disable'),
+        '#type' => 'submit',
+        '#value' => t('Disable selected modules'),
+        '#submit' => array('features_cleanup_form_disable'),
     );
     $form['buttons']['ignore'] = array(
-      '#type' => 'submit',
-      '#value' => t('Leave enabled'),
-      '#submit' => array('features_cleanup_form_ignore'),
+        '#type' => 'submit',
+        '#value' => t('Leave enabled'),
+        '#submit' => array('features_cleanup_form_ignore'),
     );
-  }
-  else {
+    }
+    else {
     drupal_goto('admin/build/features');
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
  * Submit handler for disable action on features_cleanup_form().
  */
 function features_cleanup_form_disable(&$form, &$form_state) {
-  if (!empty($form_state['values']['orphans'])) {
+    if (!empty($form_state['values']['orphans'])) {
     $disable = array_keys(array_filter($form_state['values']['orphans']));
     $ignored = array_diff(array_keys($form_state['values']['orphans']), $disable);
 
@@ -683,26 +683,26 @@ 
     // Add enabled modules to ignored orphans list.
     $ignored_orphans = variable_get('features_ignored_orphans', array());
     foreach ($ignored as $module) {
-      $ignored_orphans[$module] = $module;
+        $ignored_orphans[$module] = $module;
     }
     variable_set('features_ignored_orphans', $ignored_orphans);
-  }
-  $form_state['redirect'] = 'admin/build/features/cleanup';
+    }
+    $form_state['redirect'] = 'admin/build/features/cleanup';
 }
 
 /**
  * Submit handler for ignore action on features_cleanup_form().
  */
 function features_cleanup_form_ignore(&$form, &$form_state) {
-  if (!empty($form_state['values']['orphans'])) {
+    if (!empty($form_state['values']['orphans'])) {
     $ignored = array_keys($form_state['values']['orphans']);
     $ignored_orphans = variable_get('features_ignored_orphans', array());
     foreach ($ignored as $module) {
-      $ignored_orphans[$module] = $module;
+        $ignored_orphans[$module] = $module;
     }
     variable_set('features_ignored_orphans', $ignored_orphans);
-  }
-  $form_state['redirect'] = 'admin/build/features/cleanup';
+    }
+    $form_state['redirect'] = 'admin/build/features/cleanup';
 }
 
 /**
@@ -717,52 +717,52 @@ 
  * @return Themed display of what is different.
  */
 function features_feature_diff($feature, $component = NULL) {
-  drupal_add_css(drupal_get_path('module', 'features') .'/features.css');
-  module_load_include('inc', 'features', 'features.export');
+    drupal_add_css(drupal_get_path('module', 'features') .'/features.css');
+    module_load_include('inc', 'features', 'features.export');
 
-  $overrides = features_detect_overrides($feature);
+    $overrides = features_detect_overrides($feature);
 
-  $output = '';
-  if (!empty($overrides)) {
+    $output = '';
+    if (!empty($overrides)) {
     // Filter overrides down to specified component.
     if (isset($component) && isset($overrides[$component])) {
-      $overrides = array($component => $overrides[$component]);
+        $overrides = array($component => $overrides[$component]);
     }
 
     module_load_include('php', 'diff', 'DiffEngine');
     $formatter = new DrupalDiffFormatter();
     $rows = array();
     foreach ($overrides as $component => $items) {
-      $diff = new Diff(explode("\n", $items['default']), explode("\n", $items['normal']));
-      $rows[] = array(array('data' => $component, 'colspan' => 4, 'header' => TRUE));
-      $rows = array_merge($rows, $formatter->format($diff));
+        $diff = new Diff(explode("\n", $items['default']), explode("\n", $items['normal']));
+        $rows[] = array(array('data' => $component, 'colspan' => 4, 'header' => TRUE));
+        $rows = array_merge($rows, $formatter->format($diff));
     }
     $header = array(
-      array('data' => t('Default'), 'colspan' => 2),
-      array('data' => t('Overrides'), 'colspan' => 2),
+        array('data' => t('Default'), 'colspan' => 2),
+        array('data' => t('Overrides'), 'colspan' => 2),
     );
     $output .= theme('diff_table', $header, $rows, array('class' => 'diff features-diff'));
-  }
-  else {
+    }
+    else {
     $output = "<div class='features-empty'>". t('No changes have been made to this feature.') ."</div>";
-  }
-  $output = "<div class='features-comparison'>{$output}</div>";
-  return $output;
+    }
+    $output = "<div class='features-comparison'>{$output}</div>";
+    return $output;
 }
 
 /**
  * Compare the component names. Used to sort alphabetically.
  */
 function features_compare_component_name($a, $b) {
-  return strcasecmp($a['name'], $b['name']);
+    return strcasecmp($a['name'], $b['name']);
 }
 
 /**
  * Javascript call back that returns the status of a feature.
  */
 function features_feature_status($feature) {
-  module_load_include('inc', 'features', 'features.export');
-  return drupal_json(array('storage' => features_get_storage($feature->name)));
+    module_load_include('inc', 'features', 'features.export');
+    return drupal_json(array('storage' => features_get_storage($feature->name)));
 }
 
 /**
@@ -771,19 +771,19 @@ 
  * safely referenced by JS behaviors.
  */
 function features_dom_encode_options($options = array(), $keys_only = TRUE) {
-  $replacements = array(
+    $replacements = array(
     ':' => '__'. ord(':') .'__',
     '/' => '__'. ord('/') .'__',
     ',' => '__'. ord(',') .'__',
     '.' => '__'. ord(',') .'__',
     '<' => '__'. ord('<') .'__',
     '>' => '__'. ord('>') .'__',
-  );
-  $encoded = array();
-  foreach ($options as $key => $value) {
+    );
+    $encoded = array();
+    foreach ($options as $key => $value) {
     $encoded[strtr($key, $replacements)] = $keys_only ? $value : strtr($value, $replacements);
-  }
-  return $encoded;
+    }
+    return $encoded;
 }
 
 /**
@@ -791,17 +791,17 @@ 
  * features_dom_encode_options().
  */
 function features_dom_decode_options($options, $keys_only = FALSE) {
-  $replacements = array_flip(array(
+    $replacements = array_flip(array(
     ':' => '__'. ord(':') .'__',
     '/' => '__'. ord('/') .'__',
     ',' => '__'. ord(',') .'__',
     '.' => '__'. ord(',') .'__',
     '<' => '__'. ord('<') .'__',
     '>' => '__'. ord('>') .'__',
-  ));
-  $encoded = array();
-  foreach ($options as $key => $value) {
+    ));
+    $encoded = array();
+    foreach ($options as $key => $value) {
     $encoded[strtr($key, $replacements)] = $keys_only ? $value : strtr($value, $replacements);
-  }
-  return $encoded;
+    }
+    return $encoded;
 }

drupal/sites/default/boinc/modules/contrib/panels/panels_node/panels_node.module

Indentation +157 added lines, -157 removed lines

@@ -16,71 +16,71 @@ 
  * Implementation of hook_perm().
  */
 function panels_node_perm() {
-  return array('create panel-nodes', 'edit any panel-nodes', 'edit own panel-nodes', 'administer panel-nodes', 'delete any panel-nodes', 'delete own panel-nodes');
+    return array('create panel-nodes', 'edit any panel-nodes', 'edit own panel-nodes', 'administer panel-nodes', 'delete any panel-nodes', 'delete own panel-nodes');
 }
 
 /**
  * Implementation of hook_ctools_plugin_directory().
  */
 function panels_node_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'panels' && $plugin == 'panels_storage') {
+    if ($module == 'panels' && $plugin == 'panels_storage') {
     return 'plugins/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_menu().
  */
 function panels_node_menu() {
-  // Safety: go away if CTools is not at an appropriate version.
-  if (!defined('PANELS_REQUIRED_CTOOLS_API') || !module_invoke('ctools', 'api_version', PANELS_REQUIRED_CTOOLS_API)) {
+    // Safety: go away if CTools is not at an appropriate version.
+    if (!defined('PANELS_REQUIRED_CTOOLS_API') || !module_invoke('ctools', 'api_version', PANELS_REQUIRED_CTOOLS_API)) {
     return array();
-  }
+    }
 
-  $items['admin/build/panels/settings/panel-node'] = array(
+    $items['admin/build/panels/settings/panel-node'] = array(
     'title' => 'Panel nodes',
     'description' => 'Configure which content is available to add to panel node displays.',
     'access arguments' => array('administer panel-nodes'),
     'page callback' => 'panels_node_settings',
     'type' => MENU_LOCAL_TASK,
-  );
+    );
 
-  // Avoid some repetition on these:
-  $base = array(
+    // Avoid some repetition on these:
+    $base = array(
     'access callback' => 'panels_node_edit_node',
     'access arguments' => array(1),
     'page arguments' => array(1),
     'type' => MENU_LOCAL_TASK,
-  );
+    );
 
-  $items['node/%node/panel_layout'] = array(
+    $items['node/%node/panel_layout'] = array(
     'title' => 'Panel layout',
     'page callback' => 'panels_node_edit_layout',
     'weight' => 2,
-  ) + $base;
+    ) + $base;
 
-  $items['node/%node/panel_content'] = array(
+    $items['node/%node/panel_content'] = array(
     'title' => 'Panel content',
     'page callback' => 'panels_node_edit_content',
     'weight' => 3,
-  ) + $base;
+    ) + $base;
 
-  $items['node/add/panel/choose-layout'] = array(
+    $items['node/add/panel/choose-layout'] = array(
     'title' => 'Choose layout',
     'access arguments' => array('create panel-nodes'),
     'page callback' => 'panels_node_add',
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 function panels_node_edit_node($node) {
-  if (!isset($node->panels_node)) {
+    if (!isset($node->panels_node)) {
     return FALSE;
-  }
+    }
 
-  return node_access('update', $node);
+    return node_access('update', $node);
 }
 
 // ---------------------------------------------------------------------------
@@ -90,155 +90,155 @@ 
  * Implementation of hook_node_info().
  */
 function panels_node_node_info() {
-  // Safety: go away if CTools is not at an appropriate version.
-  if (!defined('PANELS_REQUIRED_CTOOLS_API') || !module_invoke('ctools', 'api_version', PANELS_REQUIRED_CTOOLS_API)) {
+    // Safety: go away if CTools is not at an appropriate version.
+    if (!defined('PANELS_REQUIRED_CTOOLS_API') || !module_invoke('ctools', 'api_version', PANELS_REQUIRED_CTOOLS_API)) {
     return array();
-  }
+    }
 
-  return array(
+    return array(
     'panel' => array(
-      'name' => t('Panel'),
-      'module' => 'panels_node',
-      'body_label' => t('Teaser'),
-      'description' => t("A panel layout broken up into rows and columns."),
+        'name' => t('Panel'),
+        'module' => 'panels_node',
+        'body_label' => t('Teaser'),
+        'description' => t("A panel layout broken up into rows and columns."),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_access().
  */
 function panels_node_access($op, $node, $account) {
-  if (user_access('administer panel-nodes', $account)) {
+    if (user_access('administer panel-nodes', $account)) {
     return TRUE;
-  }
+    }
 
-  if ($op == 'create' && user_access('create panel-nodes', $account)) {
+    if ($op == 'create' && user_access('create panel-nodes', $account)) {
     return TRUE;
-  }
+    }
 
-  if ($op == 'update' && (user_access('edit any panel-nodes', $account) || $node->uid == $account->uid && user_access('edit own panel-nodes', $account))) {
+    if ($op == 'update' && (user_access('edit any panel-nodes', $account) || $node->uid == $account->uid && user_access('edit own panel-nodes', $account))) {
     return TRUE;
-  }
+    }
 
 
-  if ($op == 'delete' && (user_access('delete any panel-nodes') || $node->uid == $account->uid && user_access('delete own panel-nodes'))) {
+    if ($op == 'delete' && (user_access('delete any panel-nodes') || $node->uid == $account->uid && user_access('delete own panel-nodes'))) {
     return TRUE;
-  }
+    }
 }
 
 function panels_node_add() {
-  $output = '';
+    $output = '';
 
-  ctools_include('plugins', 'panels');
-  ctools_include('common', 'panels');
+    ctools_include('plugins', 'panels');
+    ctools_include('common', 'panels');
 
-  $layouts = panels_common_get_allowed_layouts('panels_node');
-  return panels_common_print_layout_links($layouts, 'node/add/panel', array('query' => $_GET));
+    $layouts = panels_common_get_allowed_layouts('panels_node');
+    return panels_common_print_layout_links($layouts, 'node/add/panel', array('query' => $_GET));
 }
 
 /**
  * Implementation of hook_form().
  */
 function panels_node_form(&$node, &$param) {
-  ctools_include('plugins', 'panels');
+    ctools_include('plugins', 'panels');
 
-  $form['panels_node']['#tree'] = TRUE;
-  if (empty($node->nid) && arg(0) == 'node' && arg(1) == 'add') {
+    $form['panels_node']['#tree'] = TRUE;
+    if (empty($node->nid) && arg(0) == 'node' && arg(1) == 'add') {
     // Grab our selected layout from the $node, If it doesn't exist, try arg(3)
     // and if that doesn't work present them with a list to pick from.
     $panel_layout = isset($node->panel_layout) ? $node->panel_layout : arg(3);
     if (empty($panel_layout)) {
-      $opts = $_GET;
-      unset($opts['q']);
-      return drupal_goto('node/add/panel/choose-layout', $opts);
+        $opts = $_GET;
+        unset($opts['q']);
+        return drupal_goto('node/add/panel/choose-layout', $opts);
     }
 
     $layout = panels_get_layout($panel_layout);
     if (empty($layout)) {
-      return drupal_not_found();
+        return drupal_not_found();
     }
     $form['panels_node']['layout'] = array(
-      '#type' => 'value',
-      '#value' => $panel_layout,
+        '#type' => 'value',
+        '#value' => $panel_layout,
     );
-  }
+    }
 
-  $type = node_get_types('type', $node);
+    $type = node_get_types('type', $node);
 
-  $form['title'] = array(
+    $form['title'] = array(
     '#type' => 'textfield',
     '#title' => check_plain($type->title_label),
     '#required' => TRUE,
     '#default_value' => $node->title,
-  );
+    );
 
-  if (!empty($type->body_label)) {
+    if (!empty($type->body_label)) {
     $form['body_field']['#prefix'] = '<div class="body-field-wrapper">';
     $form['body_field']['#suffix'] = '</div>';
     $form['body_field']['body'] = array(
-      '#type' => 'textarea',
-      '#title' => check_plain($type->body_label),
-      '#rows' => 10,
-      '#required' => TRUE,
-      '#description' => t('The teaser is a piece of text to describe when the panel is listed (such as when promoted to front page); the actual content will only be displayed on the full node view.'),
-      '#default_value' => $node->body,
+        '#type' => 'textarea',
+        '#title' => check_plain($type->body_label),
+        '#rows' => 10,
+        '#required' => TRUE,
+        '#description' => t('The teaser is a piece of text to describe when the panel is listed (such as when promoted to front page); the actual content will only be displayed on the full node view.'),
+        '#default_value' => $node->body,
     );
     $form['body_field']['format'] = filter_form($node->format); // Now we can set the format!
-  }
+    }
 
 //  drupal_set_message('<pre>' . check_plain(var_export($node, true)) . '</pre>');
-  $css_id = '';
-  if (!empty($node->panels_node['css_id'])) {
+    $css_id = '';
+    if (!empty($node->panels_node['css_id'])) {
     $css_id = $node->panels_node['css_id'];
-  }
+    }
 
-  $form['panels_node']['css_id'] = array(
+    $form['panels_node']['css_id'] = array(
     '#type' => 'textfield',
     '#title' => t('CSS ID'),
     '#size' => 30,
     '#description' => t('An ID that can be used by CSS to style the panel.'),
     '#default_value' => $css_id,
-  );
+    );
 
-  // Support for different rendering pipelines
-  // Mostly borrowed from panel_context.inc
-  $pipelines = panels_get_renderer_pipelines();
+    // Support for different rendering pipelines
+    // Mostly borrowed from panel_context.inc
+    $pipelines = panels_get_renderer_pipelines();
 
-  // If there are no pipelines, that probably means we're operating in
-  // legacy mode.
-  if (empty($pipelines)) {
+    // If there are no pipelines, that probably means we're operating in
+    // legacy mode.
+    if (empty($pipelines)) {
     // We retain the original pipeline so we don't wreck things by installing
     // old modules.
     $form['panels_node']['pipeline'] = array(
-      '#type' => 'value',
-      '#value' => $node->panels_node['pipeline'],
+        '#type' => 'value',
+        '#value' => $node->panels_node['pipeline'],
     );
-  }
-  else {
+    }
+    else {
     $options = array();
     foreach ($pipelines as $name => $pipeline) {
-      $options[$name] = check_plain($pipeline->admin_title) . '<div class="description">' . check_plain($pipeline->admin_description) . '</div>';
+        $options[$name] = check_plain($pipeline->admin_title) . '<div class="description">' . check_plain($pipeline->admin_description) . '</div>';
     }
 
     $form['panels_node']['pipeline'] = array(
-      '#type' => 'radios',
-      '#options' => $options,
-      '#title' => t('Renderer'),
-      '#default_value' => !empty($node->panels_node['pipeline']) ? $node->panels_node['pipeline'] : 'standard',
+        '#type' => 'radios',
+        '#options' => $options,
+        '#title' => t('Renderer'),
+        '#default_value' => !empty($node->panels_node['pipeline']) ? $node->panels_node['pipeline'] : 'standard',
     );
-  }
+    }
 
-  return $form;
+    return $form;
 }
 
 /**
  * Implementation of hook_validate().
  */
 function panels_node_validate($node) {
-  if (!$node->nid && empty($node->panels_node['layout'])) {
+    if (!$node->nid && empty($node->panels_node['layout'])) {
     form_set_error('', t('Please select a layout.'));
-  }
+    }
 }
 
 /**
@@ -249,90 +249,90 @@ 
  * and that's going to be a LOT of data.
  */
 function panels_node_load($node) {
-  // We shortcut this because only in some really drastic corruption circumstance will this
-  // not work.
-  $additions['panels_node'] = db_fetch_array(db_query("SELECT * FROM {panels_node} WHERE nid = %d", $node->nid));
-  return $additions;
+    // We shortcut this because only in some really drastic corruption circumstance will this
+    // not work.
+    $additions['panels_node'] = db_fetch_array(db_query("SELECT * FROM {panels_node} WHERE nid = %d", $node->nid));
+    return $additions;
 }
 
 /**
  * Implementation of hook_insert().
  */
 function panels_node_insert(&$node) {
-  // Create a new display and record that.
-  $display = panels_new_display();
-  $display->layout = $node->panels_node['layout'];
-  $display->storage_type = 'panels_node';
-  $display->storage_id = $node->nid;
-
-  // Special handling for nodes being imported from an export.module data dump.
-  if (!empty($node->export_display)) {
+    // Create a new display and record that.
+    $display = panels_new_display();
+    $display->layout = $node->panels_node['layout'];
+    $display->storage_type = 'panels_node';
+    $display->storage_id = $node->nid;
+
+    // Special handling for nodes being imported from an export.module data dump.
+    if (!empty($node->export_display)) {
     // This works by overriding the $display set above
     eval($node->export_display);
     unset($node->export_display);
-  }
+    }
 
-  panels_save_display($display);
-  $css_id = $node->panels_node['css_id'];
+    panels_save_display($display);
+    $css_id = $node->panels_node['css_id'];
 
-  db_query("INSERT INTO {panels_node} (nid, did, css_id, pipeline) VALUES (%d, %d, '%s', '%s')", $node->nid, $display->did, $node->panels_node['css_id'], $node->panels_node['pipeline']);
+    db_query("INSERT INTO {panels_node} (nid, did, css_id, pipeline) VALUES (%d, %d, '%s', '%s')", $node->nid, $display->did, $node->panels_node['css_id'], $node->panels_node['pipeline']);
 
-  $node->panels_node['did'] = $display->did;
+    $node->panels_node['did'] = $display->did;
 }
 
 /**
  * Implementation of hook_delete().
  */
 function panels_node_delete(&$node) {
-  db_query("DELETE FROM {panels_node} WHERE nid = %d", $node->nid);
-  if (!empty($node->panels_node['did'])) {
+    db_query("DELETE FROM {panels_node} WHERE nid = %d", $node->nid);
+    if (!empty($node->panels_node['did'])) {
     panels_delete_display($node->panels_node['did']);
-  }
+    }
 }
 
 /**
  * Implementation of hook_update().
  */
 function panels_node_update($node) {
-  db_query("UPDATE {panels_node} SET css_id = '%s', pipeline = '%s' WHERE nid = %d", $node->panels_node['css_id'], $node->panels_node['pipeline'], $node->nid);
+    db_query("UPDATE {panels_node} SET css_id = '%s', pipeline = '%s' WHERE nid = %d", $node->panels_node['css_id'], $node->panels_node['pipeline'], $node->nid);
 }
 
 /**
  * Implementation of hook_view().
  */
 function panels_node_view($node, $teaser = FALSE, $page = FALSE) {
-  static $rendering = array();
+    static $rendering = array();
 
-  // Prevent loops if someone foolishly puts the node inside itself:
-  if (!empty($rendering[$node->nid])) {
+    // Prevent loops if someone foolishly puts the node inside itself:
+    if (!empty($rendering[$node->nid])) {
     return $node;
-  }
+    }
 
-  $rendering[$node->nid] = TRUE;
-  ctools_include('plugins', 'panels');
-  if ($teaser) {
+    $rendering[$node->nid] = TRUE;
+    ctools_include('plugins', 'panels');
+    if ($teaser) {
     // Do the standard view for teaser.
     $node = node_prepare($node, $teaser);
     // Because our teasier is never the same as our content, *always* provide
     // the read more flag.
     $node->readmore = TRUE;
-  }
-  else {
+    }
+    else {
     if (!empty($node->panels_node['did'])) {
-      $display = panels_load_display($node->panels_node['did']);
-      $display->css_id = $node->panels_node['css_id'];
-      // TODO: Find a way to make sure this can't node_view.
-      $display->context = panels_node_get_context($node);
-      $renderer = panels_get_renderer($node->panels_node['pipeline'], $display);
-      $node->content['body'] = array(
+        $display = panels_load_display($node->panels_node['did']);
+        $display->css_id = $node->panels_node['css_id'];
+        // TODO: Find a way to make sure this can't node_view.
+        $display->context = panels_node_get_context($node);
+        $renderer = panels_get_renderer($node->panels_node['pipeline'], $display);
+        $node->content['body'] = array(
         '#value' => panels_render_display($display, $renderer),
         '#weight' => 0,
-      );
+        );
+    }
     }
-  }
 
-  unset($rendering[$node->nid]);
-  return $node;
+    unset($rendering[$node->nid]);
+    return $node;
 }
 
 // ---------------------------------------------------------------------------
@@ -342,21 +342,21 @@ 
  * Settings for panel nodes.
  */
 function panels_node_settings() {
-  ctools_include('common', 'panels');
-  return drupal_get_form('panels_common_settings', 'panels_node');
+    ctools_include('common', 'panels');
+    return drupal_get_form('panels_common_settings', 'panels_node');
 }
 
 /**
  * Implements hook_panels_ipe_access().
  */
 function panels_node_panels_ipe_access($display) {
-  // We only care about Panels displays from panels_node.
-  if (isset($display->context['panel-node'])) {
+    // We only care about Panels displays from panels_node.
+    if (isset($display->context['panel-node'])) {
     // Only allow access to use the IPE if the user has 'update' access to
     // the underlying node.
     $node = $display->context['panel-node']->data;
     return node_access('update', $node); 
-  }
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -367,10 +367,10 @@ 
  */
 function panels_node_edit_layout($node) {
 //  ctools_include('plugins', 'panels');
-  ctools_include('context');
-  $display = panels_load_display($node->panels_node['did']);
-  $display->context = panels_node_get_context($node);
-  return panels_edit_layout($display, t('Save'), "node/$node->nid/panel_layout", 'panels_node');
+    ctools_include('context');
+    $display = panels_load_display($node->panels_node['did']);
+    $display->context = panels_node_get_context($node);
+    return panels_edit_layout($display, t('Save'), "node/$node->nid/panel_layout", 'panels_node');
 }
 
 /**
@@ -378,27 +378,27 @@ 
  */
 function panels_node_edit_content($node) {
 //  ctools_include('plugins', 'panels');
-  ctools_include('context');
-  $display = panels_load_display($node->panels_node['did']);
-  $display->context = panels_node_get_context($node);
-  ctools_include('common', 'panels');
-  $content_types = panels_common_get_allowed_types('panels_node', $display->context);
-
-  // Print this with theme('page') so that blocks are disabled while editing a display.
-  // This is important because negative margins in common block layouts (i.e, Garland)
-  // messes up the drag & drop.
-  print theme('page', panels_edit($display, "node/$node->nid/panel_content", $content_types), FALSE);
+    ctools_include('context');
+    $display = panels_load_display($node->panels_node['did']);
+    $display->context = panels_node_get_context($node);
+    ctools_include('common', 'panels');
+    $content_types = panels_common_get_allowed_types('panels_node', $display->context);
+
+    // Print this with theme('page') so that blocks are disabled while editing a display.
+    // This is important because negative margins in common block layouts (i.e, Garland)
+    // messes up the drag & drop.
+    print theme('page', panels_edit($display, "node/$node->nid/panel_content", $content_types), FALSE);
 }
 
 /**
  * Build the context to use for a panel node.
  */
 function panels_node_get_context(&$node) {
-  ctools_include('context');
-  $context = ctools_context_create('node', $node);
-  $context->identifier = t('This node');
-  $context->keyword = 'node';
-  return array('panel-node' => $context);
+    ctools_include('context');
+    $context = ctools_context_create('node', $node);
+    $context->identifier = t('This node');
+    $context->keyword = 'node';
+    return array('panel-node' => $context);
 }
 
 /**
@@ -407,15 +407,15 @@ 
  * Integrate with export.module for saving panel_nodes into code.
  */
 function panels_node_export_node_alter(&$node, $original_node, $method) {
-  if ($method == 'export') {
+    if ($method == 'export') {
     $node_export_omitted = variable_get('node_export_omitted', array());
     if (variable_get('node_export_method', '') != 'save-edit' && (array_key_exists('panel', $node_export_omitted) && !$node_export_omitted['panel'])) {
-      drupal_set_message(t("NOTE: in order to import panel_nodes you must first set the export.module settings to \"Save as a new node then edit\", otherwise it won't work."));
+        drupal_set_message(t("NOTE: in order to import panel_nodes you must first set the export.module settings to \"Save as a new node then edit\", otherwise it won't work."));
     }
     $display = panels_load_display($node->panels_node['did']);
     $export = panels_export_display($display);
     $node->export_display = $export;
-  }
+    }
 }
 
 /**
@@ -424,9 +424,9 @@ 
  * Adds panel nodes information to the Panels dashboard.
  */
 function panels_node_panels_dashboard_blocks(&$vars) {
-  $vars['links']['panels_node'] = array(
+    $vars['links']['panels_node'] = array(
     'title' => l(t('Panel node'), 'node/add/panel'),
     'description' => t('Panel nodes are node content and appear in your searches, but are more limited than panel pages.'),
     'weight' => -1,
-  );
+    );
 }

drupal/sites/default/boinc/modules/contrib/panels/panels_node/plugins/panels_storage/panels_node.inc

Indentation +5 added lines, -5 removed lines

@@ -7,19 +7,19 @@
 
 // Plugin definition
 $plugin = array(
-  'access callback' => 'panels_node_panels_storage_access',
+    'access callback' => 'panels_node_panels_storage_access',
 );
 
 /**
  * Access callback for panels storage.
  */
 function panels_node_panels_storage_access($storage_type, $storage_id, $op, $account) {
-  if ($node = node_load($storage_id)) {
+    if ($node = node_load($storage_id)) {
     if ($op == 'read') {
-      $op = 'view';
+        $op = 'view';
     }
     return node_access($op, $node, $account);
-  }
+    }
 
-  return FALSE;
+    return FALSE;
 }

drupal/sites/default/boinc/modules/contrib/panels/panels_ipe/panels_ipe.api.php

Indentation +7 added lines, -7 removed lines

@@ -16,16 +16,16 @@
  *   implementing this hook doesn't care about access for the given display.
  */
 function hook_panels_ipe_access($panels_display) {
-  // We only care about displays with the 'panelizer' context.
-  if (!isset($display->context['panelizer'])) {
+    // We only care about displays with the 'panelizer' context.
+    if (!isset($display->context['panelizer'])) {
     return NULL;
-  }
+    }
 
-  if ($display->context['panelizer']->type[0] == 'entity:node') {
+    if ($display->context['panelizer']->type[0] == 'entity:node') {
     // Allow or deny IPE access based on node type.
     return $display->context['panelizer']->data->type == 'awesome_page';
-  }
+    }
 
-  // Otherwise, deny access to everything!
-  return FALSE;
+    // Otherwise, deny access to everything!
+    return FALSE;
 }

drupal/sites/default/boinc/modules/contrib/panels/panels_ipe/plugins/display_renderers/ipe.inc

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 $plugin = array(
-  'handler' => array(
+    'handler' => array(
     'class' => 'panels_renderer_ipe',
     'parent' => 'editor',
-  ),
+    ),
 );
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/panels/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php

Indentation +121 added lines, -121 removed lines

@@ -4,52 +4,52 @@ 
  * Renderer class for all In-Place Editor (IPE) behavior.
  */
 class panels_renderer_ipe extends panels_renderer_editor {
-  // The IPE operates in normal render mode, not admin mode.
-  var $admin = FALSE;
+    // The IPE operates in normal render mode, not admin mode.
+    var $admin = FALSE;
 
-  // Whether or not the user has access.
-  var $access = NULL;
+    // Whether or not the user has access.
+    var $access = NULL;
 
-  function invoke_panels_ipe_access() {
+    function invoke_panels_ipe_access() {
     if (user_access('bypass access in place editing')) {
-      return TRUE;
+        return TRUE;
     }
     // Modules can return TRUE, FALSE or NULL, for allowed, disallowed,
     // or don't care - respectively. On the first FALSE, we deny access,
     // otherwise allow.
     foreach (module_invoke_all('panels_ipe_access', $this->display) as $result) {
-      if ($result === FALSE) {
+        if ($result === FALSE) {
         return FALSE;
-      }
+        }
     }
     return TRUE;
-  }
+    }
 
-  function access() {
+    function access() {
     if (is_null($this->access)) {
-      $this->access = $this->invoke_panels_ipe_access();
+        $this->access = $this->invoke_panels_ipe_access();
     }
     return $this->access;
-  }
+    }
 
-  function render() {
+    function render() {
     $output = parent::render();
     if ($this->access()) {
-      return "<div id='panels-ipe-display-{$this->clean_key}' class='panels-ipe-display-container'>$output</div>";
+        return "<div id='panels-ipe-display-{$this->clean_key}' class='panels-ipe-display-container'>$output</div>";
     }
     return $output;
-  }
+    }
 
-  function add_meta() {
+    function add_meta() {
     if (!$this->access()) {
-      return parent::add_meta();
+        return parent::add_meta();
     }
 
     ctools_include('display-edit', 'panels');
     ctools_include('content');
 
     if (empty($this->display->cache_key)) {
-      $this->cache = panels_edit_cache_get_default($this->display);
+        $this->cache = panels_edit_cache_get_default($this->display);
     }
     // @todo we may need an else to load the cache, but I am not sure we
     // actually need to load it if we already have our cache key, and doing
@@ -69,73 +69,73 @@ 
     ctools_add_css('panels_ipe', 'panels_ipe');
 
     $settings = array(
-      'formPath' => url($this->get_url('save-form')),
+        'formPath' => url($this->get_url('save-form')),
     );
     drupal_add_js(array('PanelsIPECacheKeys' => array($this->clean_key)), 'setting');
     drupal_add_js(array('PanelsIPESettings' => array($this->clean_key => $settings)), 'setting');
 
     jquery_ui_add(array('ui.draggable', 'ui.droppable', 'ui.sortable'));
     parent::add_meta();
-  }
-
-  /**
-   * Override & call the parent, then pass output through to the dnd wrapper
-   * theme function.
-   *
-   * @param $pane
-   */
-  function render_pane(&$pane) {
+    }
+
+    /**
+     * Override & call the parent, then pass output through to the dnd wrapper
+     * theme function.
+     *
+     * @param $pane
+     */
+    function render_pane(&$pane) {
     $output = parent::render_pane($pane);
     if (empty($output)) {
-      return;
+        return;
     }
     if (!$this->access()) {
-      return $output;
+        return $output;
     }
 
     if (empty($pane->IPE_empty)) {
-      // Add an inner layer wrapper to the pane content before placing it into
-      // draggable portlet
-      $output = "<div class=\"panels-ipe-portlet-content\">$output</div>";
+        // Add an inner layer wrapper to the pane content before placing it into
+        // draggable portlet
+        $output = "<div class=\"panels-ipe-portlet-content\">$output</div>";
     }
     else {
-      $output = "<div class=\"panels-ipe-portlet-content panels-ipe-empty-pane\">$output</div>";
+        $output = "<div class=\"panels-ipe-portlet-content panels-ipe-empty-pane\">$output</div>";
     }
     // Hand it off to the plugin/theme for placing draggers/buttons
     $output = theme('panels_ipe_pane_wrapper', $output, $pane, $this->display, $this);
     return "<div id=\"panels-ipe-paneid-{$pane->pid}\" class=\"panels-ipe-portlet-wrapper panels-ipe-portlet-marker\">" . $output . "</div>";
-  }
+    }
 
-  function render_pane_content(&$pane) {
+    function render_pane_content(&$pane) {
     $content = parent::render_pane_content($pane);
     if (!$this->access()) {
-      return $output;
+        return $output;
     }
     if (!is_object($content)) {
-      $content = new StdClass();
+        $content = new StdClass();
     }
     // Ensure that empty panes have some content.
     if (empty($content->content)) {
-      // Get the administrative title.
-      $content_type = ctools_get_content_type($pane->type);
-      $title = ctools_content_admin_title($content_type, $pane->subtype, $pane->configuration, $this->display->context);
+        // Get the administrative title.
+        $content_type = ctools_get_content_type($pane->type);
+        $title = ctools_content_admin_title($content_type, $pane->subtype, $pane->configuration, $this->display->context);
 
-      $content->content = t('Placeholder for empty "@title"', array('@title' => $title));
-      $pane->IPE_empty = TRUE;
+        $content->content = t('Placeholder for empty "@title"', array('@title' => $title));
+        $pane->IPE_empty = TRUE;
     }
 
     return $content;
-  }
-
-  /**
-   * Add an 'empty' pane placeholder above all the normal panes.
-   *
-   * @param $region_id
-   * @param $panes
-   */
-  function render_region($region_id, $panes) {
+    }
+
+    /**
+     * Add an 'empty' pane placeholder above all the normal panes.
+     *
+     * @param $region_id
+     * @param $panes
+     */
+    function render_region($region_id, $panes) {
     if (!$this->access()) {
-      return parent::render_region($region_id, $panes);
+        return parent::render_region($region_id, $panes);
     }
 
     // Generate this region's 'empty' placeholder pane from the IPE plugin.
@@ -152,28 +152,28 @@ 
     $classes = 'panels-ipe-region';
 
     return "<div id='panels-ipe-regionid-$region_id' class='panels-ipe-region'>$output</div>";
-  }
+    }
 
-  function get_panels_storage_op_for_ajax($method) {
+    function get_panels_storage_op_for_ajax($method) {
     switch ($method) {
-      case 'ajax_unlock_ipe':
+        case 'ajax_unlock_ipe':
       case 'ajax_save_form':
         return 'update';
-      case 'ajax_change_layout':
+        case 'ajax_change_layout':
       case 'ajax_set_layout':
         return 'change layout';
     }
 
     return parent::get_panels_storage_op_for_ajax($method);
-  }
+    }
  
-  /**
-   * AJAX entry point to create the controller form for an IPE.
-   */
-  function ajax_save_form($break = NULL) {
+    /**
+     * AJAX entry point to create the controller form for an IPE.
+     */
+    function ajax_save_form($break = NULL) {
     ctools_include('form');
     if (!empty($this->cache->locked)) {
-      if ($break != 'break') {
+        if ($break != 'break') {
         $account  = user_load($this->cache->locked->uid);
         $name     = theme('username', $account);
         $lock_age = format_interval(time() - $this->cache->locked->updated);
@@ -181,127 +181,127 @@ 
         $message = t("This panel is being edited by user !user, and is therefore locked from editing by others. This lock is !age old.\n\nClick OK to break this lock and discard any changes made by !user.", array('!user' => $name, '!age' => $lock_age));
 
         $this->commands[] = array(
-          'command' => 'unlockIPE',
-          'message' => $message,
-          'break_path' => url($this->get_url('save-form', 'break'))
+            'command' => 'unlockIPE',
+            'message' => $message,
+            'break_path' => url($this->get_url('save-form', 'break'))
         );
         return;
-      }
+        }
 
-      // Break the lock.
-      panels_edit_cache_break_lock($this->cache);
+        // Break the lock.
+        panels_edit_cache_break_lock($this->cache);
     }
 
     $form_state = array(
-      'display' => &$this->display,
-      'content_types' => $this->cache->content_types,
-      'rerender' => FALSE,
-      'no_redirect' => TRUE,
-      // Panels needs this to make sure that the layout gets callbacks
-      'layout' => $this->plugins['layout'],
+        'display' => &$this->display,
+        'content_types' => $this->cache->content_types,
+        'rerender' => FALSE,
+        'no_redirect' => TRUE,
+        // Panels needs this to make sure that the layout gets callbacks
+        'layout' => $this->plugins['layout'],
     );
 
     $output = ctools_build_form('panels_ipe_edit_control_form', $form_state);
     if ($output) {
-      // At this point, we want to save the cache to ensure that we have a lock.
-      panels_edit_cache_set($this->cache);
-      $this->commands[] = array(
+        // At this point, we want to save the cache to ensure that we have a lock.
+        panels_edit_cache_set($this->cache);
+        $this->commands[] = array(
         'command' => 'initIPE',
         'key' => $this->clean_key,
         'data' => $output,
-      );
-      return;
+        );
+        return;
     }
 
     // no output == submit
     if (!empty($form_state['clicked_button']['#save-display'])) {
-      // Saved. Save the cache.
-      panels_edit_cache_save($this->cache);
+        // Saved. Save the cache.
+        panels_edit_cache_save($this->cache);
     }
     else {
-      // Cancelled. Clear the cache.
-      panels_edit_cache_clear($this->cache);
+        // Cancelled. Clear the cache.
+        panels_edit_cache_clear($this->cache);
     }
 
     $this->commands[] = array(
-      'command' => 'endIPE',
-      'key' => $this->clean_key,
-      'data' => $output,
+        'command' => 'endIPE',
+        'key' => $this->clean_key,
+        'data' => $output,
     );
-  }
+    }
 
-  /**
-   * Create a command array to redraw a pane.
-   */
-  function command_update_pane($pid) {
+    /**
+     * Create a command array to redraw a pane.
+     */
+    function command_update_pane($pid) {
     if (is_object($pid)) {
-      $pane = $pid;
+        $pane = $pid;
     }
     else {
-      $pane = $this->display->content[$pid];
+        $pane = $this->display->content[$pid];
     }
 
     $this->commands[] = ctools_ajax_command_replace("#panels-ipe-paneid-$pane->pid", $this->render_pane($pane));
     $this->commands[] = ctools_ajax_command_changed("#panels-ipe-display-{$this->clean_key}");
-  }
+    }
 
-  /**
-   * Create a command array to add a new pane.
-   */
-  function command_add_pane($pid) {
+    /**
+     * Create a command array to add a new pane.
+     */
+    function command_add_pane($pid) {
     if (is_object($pid)) {
-      $pane = $pid;
+        $pane = $pid;
     }
     else {
-      $pane = $this->display->content[$pid];
+        $pane = $this->display->content[$pid];
     }
 
     $this->commands[] = ctools_ajax_command_append("#panels-ipe-regionid-{$pane->panel} div.panels-ipe-sort-container", $this->render_pane($pane));
     $this->commands[] = ctools_ajax_command_changed("#panels-ipe-display-{$this->clean_key}");
-  }
+    }
 }
 
 /**
  * FAPI callback to create the Save/Cancel form for the IPE.
  */
 function panels_ipe_edit_control_form(&$form_state) {
-  $display = &$form_state['display'];
-  // @todo -- this should be unnecessary as we ensure cache_key is set in add_meta()
+    $display = &$form_state['display'];
+    // @todo -- this should be unnecessary as we ensure cache_key is set in add_meta()
 //  $display->cache_key = isset($display->cache_key) ? $display->cache_key : $display->did;
 
-  // Annoyingly, theme doesn't have access to form_state so we have to do this.
-  $form['#display'] = $display;
+    // Annoyingly, theme doesn't have access to form_state so we have to do this.
+    $form['#display'] = $display;
 
-  $layout = panels_get_layout($display->layout);
-  $layout_panels = panels_get_regions($layout, $display);
+    $layout = panels_get_layout($display->layout);
+    $layout_panels = panels_get_regions($layout, $display);
 
-  $form['panel'] = array('#tree' => TRUE);
-  $form['panel']['pane'] = array('#tree' => TRUE);
+    $form['panel'] = array('#tree' => TRUE);
+    $form['panel']['pane'] = array('#tree' => TRUE);
 
-  foreach ($layout_panels as $panel_id => $title) {
+    foreach ($layout_panels as $panel_id => $title) {
     // Make sure we at least have an empty array for all possible locations.
     if (!isset($display->panels[$panel_id])) {
-      $display->panels[$panel_id] = array();
+        $display->panels[$panel_id] = array();
     }
 
     $form['panel']['pane'][$panel_id] = array(
-      // Use 'hidden' instead of 'value' so the js can access it.
-      '#type' => 'hidden',
-      '#default_value' => implode(',', (array) $display->panels[$panel_id]),
+        // Use 'hidden' instead of 'value' so the js can access it.
+        '#type' => 'hidden',
+        '#default_value' => implode(',', (array) $display->panels[$panel_id]),
     );
-  }
+    }
 
-  $form['buttons']['submit'] = array(
+    $form['buttons']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
     '#id' => 'panels-ipe-save',
     '#submit' => array('panels_edit_display_form_submit'),
     '#save-display' => TRUE,
-  );
-  $form['buttons']['cancel'] = array(
+    );
+    $form['buttons']['cancel'] = array(
     '#type' => 'submit',
     '#value' => t('Cancel'),
     '#id' => 'panels-ipe-cancel',
-  );
-  return $form;
+    );
+    return $form;
 }