BOINC / boinc

drupal/sites/default/boinc/modules/contrib/wysiwyg/wysiwyg.module

Indentation +416 added lines, -416 removed lines

@@ -9,19 +9,19 @@ 
  * Implementation of hook_menu().
  */
 function wysiwyg_menu() {
-  $items['admin/settings/wysiwyg'] = array(
+    $items['admin/settings/wysiwyg'] = array(
     'title' => 'Wysiwyg profiles',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('wysiwyg_profile_overview'),
     'description' => 'Configure client-side editors.',
     'access arguments' => array('administer filters'),
     'file' => 'wysiwyg.admin.inc',
-  );
-  $items['admin/settings/wysiwyg/profile'] = array(
+    );
+    $items['admin/settings/wysiwyg/profile'] = array(
     'title' => 'List',
     'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/edit'] = array(
+    );
+    $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/edit'] = array(
     'title' => 'Edit',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('wysiwyg_profile_form', 4),
@@ -30,8 +30,8 @@ 
     'tab_root' => 'admin/settings/wysiwyg/profile',
     'tab_parent' => 'admin/settings/wysiwyg/profile/%wysiwyg_profile',
     'type' => MENU_LOCAL_TASK,
-  );
-  $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/delete'] = array(
+    );
+    $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/delete'] = array(
     'title' => 'Remove',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('wysiwyg_profile_delete_confirm', 4),
@@ -41,15 +41,15 @@ 
     'tab_parent' => 'admin/settings/wysiwyg/profile/%wysiwyg_profile',
     'type' => MENU_LOCAL_TASK,
     'weight' => 10,
-  );
-  $items['wysiwyg/%'] = array(
+    );
+    $items['wysiwyg/%'] = array(
     'page callback' => 'wysiwyg_dialog',
     'page arguments' => array(1),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
     'file' => 'wysiwyg.dialog.inc',
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
@@ -59,37 +59,37 @@ 
  * @see template_preprocess_page(), theme.inc
  */
 function wysiwyg_theme() {
-  return array(
+    return array(
     'wysiwyg_profile_overview' => array(
-      'arguments' => array('form' => NULL),
+        'arguments' => array('form' => NULL),
     ),
     'wysiwyg_admin_button_table' => array(
-      'arguments' => array('form' => NULL),
+        'arguments' => array('form' => NULL),
     ),
     'wysiwyg_dialog_page' => array(
-      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
-      'file' => 'wysiwyg.dialog.inc',
-      'template' => 'wysiwyg-dialog-page',
+        'arguments' => array('content' => NULL, 'show_messages' => TRUE),
+        'file' => 'wysiwyg.dialog.inc',
+        'template' => 'wysiwyg-dialog-page',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_help().
  */
 function wysiwyg_help($path, $arg) {
-  switch ($path) {
+    switch ($path) {
     case 'admin/settings/wysiwyg':
       $output = '<p>' . t('A Wysiwyg profile is associated with an input format. A Wysiwyg profile defines which client-side editor is loaded with a particular input format, what buttons or themes are enabled for the editor, how the editor is displayed, and a few other editor-specific functions.') . '</p>';
-      return $output;
-  }
+        return $output;
+    }
 }
 
 /**
  * Clear wysiwyg cache on admin/build/modules form.
  */
 function wysiwyg_form_system_modules_alter(&$form, $form_state) {
-  wysiwyg_profile_load_all(TRUE);
+    wysiwyg_profile_load_all(TRUE);
 }
 
 /**
@@ -104,11 +104,11 @@ 
  * @see wysiwyg_process_form()
  */
 function wysiwyg_form_alter(&$form, &$form_state) {
-  $form['#after_build'][] = 'wysiwyg_process_form';
-  // Teaser splitter is unconditionally removed and NOT supported.
-  if (isset($form['body_field'])) {
+    $form['#after_build'][] = 'wysiwyg_process_form';
+    // Teaser splitter is unconditionally removed and NOT supported.
+    if (isset($form['body_field'])) {
     unset($form['body_field']['teaser_js']);
-  }
+    }
 }
 
 /**
@@ -123,53 +123,53 @@ 
  * @see wysiwyg_elements(), filter_form()
  */
 function wysiwyg_process_form(&$form) {
-  // Iterate over element children; resetting array keys to access last index.
-  if ($children = array_values(element_children($form))) {
+    // Iterate over element children; resetting array keys to access last index.
+    if ($children = array_values(element_children($form))) {
     foreach ($children as $index => $item) {
-      $element = &$form[$item];
+        $element = &$form[$item];
 
-      // filter_form() always uses the key 'format'. We need a type-agnostic
-      // match to prevent false positives. Also, there must have been at least
-      // one element on this level.
-      if (($item === 'format' || $item === 'signature_format') && $index > 0) {
+        // filter_form() always uses the key 'format'. We need a type-agnostic
+        // match to prevent false positives. Also, there must have been at least
+        // one element on this level.
+        if (($item === 'format' || $item === 'signature_format') && $index > 0) {
         // Make sure we either match a input format selector or input format
         // guidelines (displayed if user has access to one input format only).
         if ((isset($element['#type']) && $element['#type'] == 'fieldset') || isset($element['format']['guidelines'])) {
-          // The element before this element is the target form field.
-          $field = &$form[$children[$index - 1]];
+            // The element before this element is the target form field.
+            $field = &$form[$children[$index - 1]];
 
-          // Allow modules to programmatically enforce no client-side editor by
-          // setting the #wysiwyg property to FALSE.
-          if (isset($field['#wysiwyg']) && !$field['#wysiwyg']) {
+            // Allow modules to programmatically enforce no client-side editor by
+            // setting the #wysiwyg property to FALSE.
+            if (isset($field['#wysiwyg']) && !$field['#wysiwyg']) {
             // A 'format' element should not have any child elements that may
             // need processing, so it should be safe to skip the recursion that
             // happens at the end of this function, and move on to the next
             // element on the same level.
             continue;
-          }
-
-          // If this textarea is #resizable and we will load at least one
-          // editor, then only load the behavior and let the 'none' editor
-          // attach/detach it to avoid hi-jacking the UI. Due to our CSS class
-          // parsing, we can add arbitrary parameters for each input format.
-          // The #resizable property will be removed below, if at least one
-          // profile has been loaded.
-          $extra_class = '';
-          if (!empty($field['#resizable'])) {
+            }
+
+            // If this textarea is #resizable and we will load at least one
+            // editor, then only load the behavior and let the 'none' editor
+            // attach/detach it to avoid hi-jacking the UI. Due to our CSS class
+            // parsing, we can add arbitrary parameters for each input format.
+            // The #resizable property will be removed below, if at least one
+            // profile has been loaded.
+            $extra_class = '';
+            if (!empty($field['#resizable'])) {
             $extra_class = ' wysiwyg-resizable-1';
             drupal_add_js('misc/textarea.js');
-          }
-
-          // Determine the available input formats. The last child element is a
-          // link to "More information about formatting options". When only one
-          // input format is displayed, we also have to remove formatting
-          // guidelines, stored in the child 'format'.
-          $formats = element_children($element);
-          array_pop($formats);
-          if (($key = array_search('format', $formats)) !== FALSE) {
+            }
+
+            // Determine the available input formats. The last child element is a
+            // link to "More information about formatting options". When only one
+            // input format is displayed, we also have to remove formatting
+            // guidelines, stored in the child 'format'.
+            $formats = element_children($element);
+            array_pop($formats);
+            if (($key = array_search('format', $formats)) !== FALSE) {
             unset($formats[$key]);
-          }
-          foreach ($formats as $format) {
+            }
+            foreach ($formats as $format) {
             // Default to 'none' editor (Drupal's default behaviors).
             $editor = 'none';
             $status = 1;
@@ -177,51 +177,51 @@ 
             // Fetch the profile associated to this input format.
             $profile = wysiwyg_get_profile($format);
             if ($profile) {
-              $loaded = TRUE;
-              $editor = $profile->editor;
-              $status = (int) wysiwyg_user_get_status($profile);
-              if (isset($profile->settings['show_toggle'])) {
+                $loaded = TRUE;
+                $editor = $profile->editor;
+                $status = (int) wysiwyg_user_get_status($profile);
+                if (isset($profile->settings['show_toggle'])) {
                 $toggle = (int) $profile->settings['show_toggle'];
-              }
-              // Check editor theme (and reset it if not/no longer available).
-              $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : ''));
-
-              // Add plugin settings (first) for this input format.
-              wysiwyg_add_plugin_settings($profile);
-              // Add profile settings for this input format.
-              wysiwyg_add_editor_settings($profile, $theme);
+                }
+                // Check editor theme (and reset it if not/no longer available).
+                $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : ''));
+
+                // Add plugin settings (first) for this input format.
+                wysiwyg_add_plugin_settings($profile);
+                // Add profile settings for this input format.
+                wysiwyg_add_editor_settings($profile, $theme);
             }
 
             // Use a prefix/suffix for a single input format, or attach to input
             // format selector radio buttons.
             if (isset($element['format']['guidelines'])) {
-              $element['format']['guidelines']['#prefix'] = '<div class="wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class . '">';
-              $element['format']['guidelines']['#suffix'] = '</div>';
-              // Edge-case: Default format contains no input filters.
-              if (empty($element['format']['guidelines']['#value'])) {
+                $element['format']['guidelines']['#prefix'] = '<div class="wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class . '">';
+                $element['format']['guidelines']['#suffix'] = '</div>';
+                // Edge-case: Default format contains no input filters.
+                if (empty($element['format']['guidelines']['#value'])) {
                 $element['format']['guidelines']['#value'] = ' ';
-              }
+                }
             }
             else {
-              $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : '');
-              $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class;
+                $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : '');
+                $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class;
+            }
             }
-          }
 
-          // If we loaded at least one editor, then the 'none' editor will
-          // handle resizable textareas instead of core.
-          if (isset($loaded) && !empty($field['#resizable'])) {
+            // If we loaded at least one editor, then the 'none' editor will
+            // handle resizable textareas instead of core.
+            if (isset($loaded) && !empty($field['#resizable'])) {
             $field['#resizable'] = FALSE;
-          }
+            }
         }
         // If this element is 'format', do not recurse further.
         continue;
-      }
-      // Recurse into children.
-      wysiwyg_process_form($element);
+        }
+        // Recurse into children.
+        wysiwyg_process_form($element);
+    }
     }
-  }
-  return $form;
+    return $form;
 }
 
 /**
@@ -239,12 +239,12 @@ 
  * @see wysiwyg_load_editor(), wysiwyg_get_editor()
  */
 function wysiwyg_get_profile($format) {
-  if ($profile = wysiwyg_profile_load($format)) {
+    if ($profile = wysiwyg_profile_load($format)) {
     if (wysiwyg_load_editor($profile)) {
-      return $profile;
+        return $profile;
+    }
     }
-  }
-  return FALSE;
+    return FALSE;
 }
 
 /**
@@ -259,82 +259,82 @@ 
  * @see wysiwyg_get_profile()
  */
 function wysiwyg_load_editor($profile) {
-  static $settings_added;
-  static $loaded = array();
+    static $settings_added;
+    static $loaded = array();
 
-  $name = $profile->editor;
-  // Library files must be loaded only once.
-  if (!isset($loaded[$name])) {
+    $name = $profile->editor;
+    // Library files must be loaded only once.
+    if (!isset($loaded[$name])) {
     // Load editor.
     $editor = wysiwyg_get_editor($name);
     if ($editor) {
-      // Determine library files to load.
-      // @todo Allow to configure the library/execMode to use.
-      if (isset($profile->settings['library']) && isset($editor['libraries'][$profile->settings['library']])) {
+        // Determine library files to load.
+        // @todo Allow to configure the library/execMode to use.
+        if (isset($profile->settings['library']) && isset($editor['libraries'][$profile->settings['library']])) {
         $library = $profile->settings['library'];
         $files = $editor['libraries'][$library]['files'];
-      }
-      else {
+        }
+        else {
         // Fallback to the first defined library by default (external libraries can change).
         $library = key($editor['libraries']);
         $files = array_shift($editor['libraries']);
         $files = $files['files'];
-      }
-      foreach ($files as $file => $options) {
+        }
+        foreach ($files as $file => $options) {
         if (is_array($options)) {
-          $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE);
-          drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
+            $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE);
+            drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
         }
         else {
-          drupal_add_js($editor['library path'] . '/' . $options);
+            drupal_add_js($editor['library path'] . '/' . $options);
         }
-      }
-      // If editor defines an additional load callback, invoke it.
-      // @todo Isn't the settings callback sufficient?
-      if (isset($editor['load callback']) && function_exists($editor['load callback'])) {
+        }
+        // If editor defines an additional load callback, invoke it.
+        // @todo Isn't the settings callback sufficient?
+        if (isset($editor['load callback']) && function_exists($editor['load callback'])) {
         $editor['load callback']($editor, $library);
-      }
-      // Load JavaScript integration files for this editor.
-      $files = array();
-      if (isset($editor['js files'])) {
+        }
+        // Load JavaScript integration files for this editor.
+        $files = array();
+        if (isset($editor['js files'])) {
         $files = $editor['js files'];
-      }
-      foreach ($files as $file) {
+        }
+        foreach ($files as $file) {
         drupal_add_js($editor['js path'] . '/' . $file);
-      }
-      // Load CSS stylesheets for this editor.
-      $files = array();
-      if (isset($editor['css files'])) {
+        }
+        // Load CSS stylesheets for this editor.
+        $files = array();
+        if (isset($editor['css files'])) {
         $files = $editor['css files'];
-      }
-      foreach ($files as $file) {
+        }
+        foreach ($files as $file) {
         drupal_add_css($editor['css path'] . '/' . $file);
-      }
+        }
 
-      drupal_add_js(array('wysiwyg' => array(
+        drupal_add_js(array('wysiwyg' => array(
         'configs' => array($editor['name'] => array('global' => array(
-          // @todo Move into (global) editor settings.
-          // If JS compression is enabled, at least TinyMCE is unable to determine
-          // its own base path and exec mode since it can't find the script name.
-          'editorBasePath' => base_path() . $editor['library path'],
-          'execMode' => $library,
+            // @todo Move into (global) editor settings.
+            // If JS compression is enabled, at least TinyMCE is unable to determine
+            // its own base path and exec mode since it can't find the script name.
+            'editorBasePath' => base_path() . $editor['library path'],
+            'execMode' => $library,
         ))),
-      )), 'setting');
+        )), 'setting');
 
-      $loaded[$name] = TRUE;
+        $loaded[$name] = TRUE;
     }
     else {
-      $loaded[$name] = FALSE;
+        $loaded[$name] = FALSE;
+    }
     }
-  }
 
-  // Add basic Wysiwyg settings if any editor has been added.
-  if (!isset($settings_added) && $loaded[$name]) {
+    // Add basic Wysiwyg settings if any editor has been added.
+    if (!isset($settings_added) && $loaded[$name]) {
     drupal_add_js(array('wysiwyg' => array(
-      'configs' => array(),
-      'plugins' => array(),
-      'disable' => t('Disable rich-text'),
-      'enable' => t('Enable rich-text'),
+        'configs' => array(),
+        'plugins' => array(),
+        'disable' => t('Disable rich-text'),
+        'enable' => t('Enable rich-text'),
     )), 'setting');
 
     $path = drupal_get_path('module', 'wysiwyg');
@@ -355,26 +355,26 @@ 
     drupal_add_js($path . '/wysiwyg.js', 'module', 'footer');
 
     $settings_added = TRUE;
-  }
+    }
 
-  return $loaded[$name];
+    return $loaded[$name];
 }
 
 /**
  * Add editor settings for a given input format.
  */
 function wysiwyg_add_editor_settings($profile, $theme) {
-  static $formats = array();
+    static $formats = array();
 
-  if (!isset($formats[$profile->format])) {
+    if (!isset($formats[$profile->format])) {
     $config = wysiwyg_get_editor_config($profile, $theme);
     // drupal_to_js() does not properly convert numeric array keys, so we need
     // to use a string instead of the format id.
     if ($config) {
-      drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting');
+        drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting');
     }
     $formats[$profile->format] = TRUE;
-  }
+    }
 }
 
 /**
@@ -402,86 +402,86 @@ 
  *   and simplify this entire function.
  */
 function wysiwyg_add_plugin_settings($profile) {
-  static $plugins = array();
-  static $processed_plugins = array();
-  static $processed_formats = array();
+    static $plugins = array();
+    static $processed_plugins = array();
+    static $processed_formats = array();
 
-  // Each input format must only processed once.
-  // @todo ...as long as we do not have multiple profiles per format.
-  if (isset($processed_formats[$profile->format])) {
+    // Each input format must only processed once.
+    // @todo ...as long as we do not have multiple profiles per format.
+    if (isset($processed_formats[$profile->format])) {
     return;
-  }
-  $processed_formats[$profile->format] = TRUE;
+    }
+    $processed_formats[$profile->format] = TRUE;
 
-  $editor = wysiwyg_get_editor($profile->editor);
+    $editor = wysiwyg_get_editor($profile->editor);
 
-  // Collect native plugins for this editor provided via hook_wysiwyg_plugin()
-  // and Drupal plugins provided via hook_wysiwyg_include_directory().
-  if (!array_key_exists($editor['name'], $plugins)) {
+    // Collect native plugins for this editor provided via hook_wysiwyg_plugin()
+    // and Drupal plugins provided via hook_wysiwyg_include_directory().
+    if (!array_key_exists($editor['name'], $plugins)) {
     $plugins[$editor['name']] = wysiwyg_get_plugins($editor['name']);
-  }
+    }
 
-  // Nothing to do, if there are no plugins.
-  if (empty($plugins[$editor['name']])) {
+    // Nothing to do, if there are no plugins.
+    if (empty($plugins[$editor['name']])) {
     return;
-  }
+    }
 
-  // Determine name of proxy plugin for Drupal plugins.
-  $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : '');
+    // Determine name of proxy plugin for Drupal plugins.
+    $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : '');
 
-  // Process native editor plugins.
-  if (isset($editor['plugin settings callback'])) {
+    // Process native editor plugins.
+    if (isset($editor['plugin settings callback'])) {
     // @todo Require PHP 5.1 in 3.x and use array_intersect_key().
     $profile_plugins_native = array();
     foreach ($plugins[$editor['name']] as $plugin => $meta) {
-      // Skip Drupal plugins (handled below).
-      if ($plugin === $proxy) {
+        // Skip Drupal plugins (handled below).
+        if ($plugin === $proxy) {
         continue;
-      }
-      // Only keep native plugins that are enabled in this profile.
-      if (isset($profile->settings['buttons'][$plugin])) {
+        }
+        // Only keep native plugins that are enabled in this profile.
+        if (isset($profile->settings['buttons'][$plugin])) {
         $profile_plugins_native[$plugin] = $meta;
-      }
+        }
     }
     // Invoke the editor's plugin settings callback, so it can populate the
     // settings for native external plugins with required values.
     $settings_native = call_user_func($editor['plugin settings callback'], $editor, $profile, $profile_plugins_native);
 
     if ($settings_native) {
-      drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('native' => $settings_native)))), 'setting');
+        drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('native' => $settings_native)))), 'setting');
+    }
     }
-  }
 
-  // Process Drupal plugins.
-  if ($proxy && isset($editor['proxy plugin settings callback'])) {
+    // Process Drupal plugins.
+    if ($proxy && isset($editor['proxy plugin settings callback'])) {
     $profile_plugins_drupal = array();
     foreach (wysiwyg_get_all_plugins() as $plugin => $meta) {
-      if (isset($profile->settings['buttons'][$proxy][$plugin])) {
+        if (isset($profile->settings['buttons'][$proxy][$plugin])) {
         // JavaScript and plugin-specific settings for Drupal plugins must be
         // loaded and processed only once. Plugin information is cached
         // statically to pass it to the editor's proxy plugin settings callback.
         if (!isset($processed_plugins[$proxy][$plugin])) {
-          $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta;
-          // Load the Drupal plugin's JavaScript.
-          drupal_add_js($meta['js path'] . '/' . $meta['js file']);
-          // Add plugin-specific settings.
-          if (isset($meta['settings'])) {
+            $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta;
+            // Load the Drupal plugin's JavaScript.
+            drupal_add_js($meta['js path'] . '/' . $meta['js file']);
+            // Add plugin-specific settings.
+            if (isset($meta['settings'])) {
             drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($plugin => $meta['settings'])))), 'setting');
-          }
+            }
         }
         else {
-          $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin];
+            $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin];
+        }
         }
-      }
     }
     // Invoke the editor's proxy plugin settings callback, so it can populate
     // the settings for Drupal plugins with custom, required values.
     $settings_drupal = call_user_func($editor['proxy plugin settings callback'], $editor, $profile, $profile_plugins_drupal);
 
     if ($settings_drupal) {
-      drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('drupal' => $settings_drupal)))), 'setting');
+        drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('drupal' => $settings_drupal)))), 'setting');
+    }
     }
-  }
 }
 
 /**
@@ -499,28 +499,28 @@ 
  *   was given.
  */
 function wysiwyg_get_editor_themes(&$profile, $selected_theme = NULL) {
-  static $themes = array();
+    static $themes = array();
 
-  if (!isset($themes[$profile->editor])) {
+    if (!isset($themes[$profile->editor])) {
     $editor = wysiwyg_get_editor($profile->editor);
     if (isset($editor['themes callback']) && function_exists($editor['themes callback'])) {
-      $themes[$editor['name']] = $editor['themes callback']($editor, $profile);
+        $themes[$editor['name']] = $editor['themes callback']($editor, $profile);
     }
     // Fallback to 'default' otherwise.
     else {
-      $themes[$editor['name']] = array('default');
+        $themes[$editor['name']] = array('default');
+    }
     }
-  }
 
-  // Check optional $selected_theme argument, if given.
-  if (isset($selected_theme)) {
+    // Check optional $selected_theme argument, if given.
+    if (isset($selected_theme)) {
     // If the passed theme name does not exist, use the first available.
     if (!in_array($selected_theme, $themes[$profile->editor])) {
-      $selected_theme = $profile->settings['theme'] = $themes[$profile->editor][0];
+        $selected_theme = $profile->settings['theme'] = $themes[$profile->editor][0];
+    }
     }
-  }
 
-  return isset($selected_theme) ? $selected_theme : $themes[$profile->editor];
+    return isset($selected_theme) ? $selected_theme : $themes[$profile->editor];
 }
 
 /**
@@ -533,42 +533,42 @@ 
  *   An array for each plugin.
  */
 function wysiwyg_get_plugins($editor_name) {
-  $plugins = array();
-  if (!empty($editor_name)) {
+    $plugins = array();
+    if (!empty($editor_name)) {
     $editor = wysiwyg_get_editor($editor_name);
     // Add internal editor plugins.
     if (isset($editor['plugin callback']) && function_exists($editor['plugin callback'])) {
-      $plugins = $editor['plugin callback']($editor);
+        $plugins = $editor['plugin callback']($editor);
     }
     // Add editor plugins provided via hook_wysiwyg_plugin().
     $plugins = array_merge($plugins, module_invoke_all('wysiwyg_plugin', $editor['name'], $editor['installed version']));
     // Add API plugins provided by Drupal modules.
     // @todo We need to pass the filepath to the plugin icon for Drupal plugins.
     if (isset($editor['proxy plugin'])) {
-      $plugins += $editor['proxy plugin'];
-      $proxy = key($editor['proxy plugin']);
-      foreach (wysiwyg_get_all_plugins() as $plugin_name => $info) {
+        $plugins += $editor['proxy plugin'];
+        $proxy = key($editor['proxy plugin']);
+        foreach (wysiwyg_get_all_plugins() as $plugin_name => $info) {
         $plugins[$proxy]['buttons'][$plugin_name] = $info['title'];
-      }
+        }
+    }
     }
-  }
-  return $plugins;
+    return $plugins;
 }
 
 /**
  * Return an array of initial editor settings for a Wysiwyg profile.
  */
 function wysiwyg_get_editor_config($profile, $theme) {
-  $editor = wysiwyg_get_editor($profile->editor);
-  $settings = array();
-  if (!empty($editor['settings callback']) && function_exists($editor['settings callback'])) {
+    $editor = wysiwyg_get_editor($profile->editor);
+    $settings = array();
+    if (!empty($editor['settings callback']) && function_exists($editor['settings callback'])) {
     $settings = $editor['settings callback']($editor, $profile->settings, $theme);
 
     // Allow other modules to alter the editor settings for this format.
     $context = array('editor' => $editor, 'profile' => $profile, 'theme' => $theme);
     drupal_alter('wysiwyg_editor_settings', $settings, $context);
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
@@ -581,106 +581,106 @@ 
  *   An array containing CSS files, including proper base path.
  */
 function wysiwyg_get_css() {
-  static $files;
+    static $files;
 
-  if (isset($files)) {
+    if (isset($files)) {
     return $files;
-  }
-  // In node form previews, the theme has not been initialized yet.
-  if (!empty($_POST)) {
+    }
+    // In node form previews, the theme has not been initialized yet.
+    if (!empty($_POST)) {
     init_theme();
-  }
+    }
 
-  $files = array();
-  foreach (drupal_add_css() as $media => $css) {
+    $files = array();
+    foreach (drupal_add_css() as $media => $css) {
     if ($media != 'print') {
-      foreach ($css['theme'] as $filepath => $preprocess) {
+        foreach ($css['theme'] as $filepath => $preprocess) {
         if (file_exists($filepath)) {
-          $files[] = base_path() . $filepath;
+            $files[] = base_path() . $filepath;
+        }
         }
-      }
     }
-  }
-  return $files;
+    }
+    return $files;
 }
 
 /**
  * Load profile for a given input format.
  */
 function wysiwyg_profile_load($format) {
-  static $profiles;
+    static $profiles;
 
-  if (!isset($profiles) || !array_key_exists($format, $profiles)) {
+    if (!isset($profiles) || !array_key_exists($format, $profiles)) {
     $profiles = wysiwyg_profile_load_all();
-  }
+    }
 
-  return (isset($profiles[$format]) ? $profiles[$format] : FALSE);
+    return (isset($profiles[$format]) ? $profiles[$format] : FALSE);
 }
 
 /**
  * Load all profiles.
  */
 function wysiwyg_profile_load_all($reset = FALSE) {
-  static $profiles;
+    static $profiles;
 
-  if ($reset || !isset($profiles)) {
+    if ($reset || !isset($profiles)) {
     $profiles = array();
     if (!$reset && ($cache = cache_get('wysiwyg:profiles', 'cache')) && is_array($cache->data)) {
-      $profiles = $cache->data;
-      return $profiles;
+        $profiles = $cache->data;
+        return $profiles;
     }
     // If Exportables and CTools are installed, use their API to load both
     // wysiwyg profiles from code and from the database
     if (module_exists('ctools') && module_exists('exportables')) {
-      if (exportables_api_version('2.0') && ctools_api_version('1.7')) {
+        if (exportables_api_version('2.0') && ctools_api_version('1.7')) {
         $input_formats = exportables_load_all('input_formats');
         ctools_include('export');
         $ctools_profiles = ctools_export_load_object('wysiwyg');
         // Wysiwyg module still use numeric ids as keys
         foreach ($ctools_profiles as $machine_name => $profile) {
-          $profile->format = $input_formats[$machine_name];
-          $profiles[$profile->format] = $profile;
+            $profile->format = $input_formats[$machine_name];
+            $profiles[$profile->format] = $profile;
+        }
         }
-      }
     }
 
     // DB profiles will always override Features profiles from flat files.
     $result = db_query('SELECT format, editor, settings FROM {wysiwyg}');
     while ($profile = db_fetch_object($result)) {
-      if (!isset($profiles[$profile->format])) {
+        if (!isset($profiles[$profile->format])) {
         $profile->settings = unserialize($profile->settings);
         $profiles[$profile->format] = $profile;
-      }
+        }
     }
 
     drupal_alter('wysiwyg_load_profiles', $profiles);
     cache_set('wysiwyg:profiles', $profiles);
-  }
+    }
 
-  return $profiles;
+    return $profiles;
 }
- /**
- * Wysiwyg profiles list callback.
- */
+    /**
+     * Wysiwyg profiles list callback.
+     */
 function wysiwyg_profile_list() {
-  $profiles = wysiwyg_profile_load_all(TRUE);
-  $filter_formats = filter_formats();
-  $list = array();
-  foreach ($profiles as $profile) {
+    $profiles = wysiwyg_profile_load_all(TRUE);
+    $filter_formats = filter_formats();
+    $list = array();
+    foreach ($profiles as $profile) {
     $list[$profile->machine] = t('@format (@editor)', array('@editor' => $profile->editor, '@format' => $filter_formats[$profile->format]->name));
-  }
-  return $list;
+    }
+    return $list;
 }
 
 /**
  * Remove a profile from the database.
  */
 function wysiwyg_profile_delete($wysiwyg) {
-  if (!isset($wysiwyg->format)) {
+    if (!isset($wysiwyg->format)) {
     $input_formats = exportables_load_all('input_formats');
     $wysiwyg->format = $input_formats[$wysiwyg->machine];
-  }
-  db_query("DELETE FROM {wysiwyg} WHERE format = %d", $wysiwyg->format);
+    }
+    db_query("DELETE FROM {wysiwyg} WHERE format = %d", $wysiwyg->format);
 }
 
 
@@ -689,68 +689,68 @@ 
  * Implementation of hook_user().
  */
 function wysiwyg_user($op, &$edit, $account, $category = NULL) {
-  if ($op == 'form' && $category == 'account') {
+    if ($op == 'form' && $category == 'account') {
     $user_formats = filter_formats();
     $options = array();
     $options_default = array();
     foreach (wysiwyg_profile_load_all() as $format => $profile) {
-      // Only show profiles that have user_choose enabled.
-      if (!empty($profile->settings['user_choose']) && isset($user_formats[$format])) {
+        // Only show profiles that have user_choose enabled.
+        if (!empty($profile->settings['user_choose']) && isset($user_formats[$format])) {
         $options[$format] = check_plain($user_formats[$format]->name);
         if (wysiwyg_user_get_status($profile, $account)) {
-          $options_default[] = $format;
+            $options_default[] = $format;
+        }
         }
-      }
     }
     if (!empty($options)) {
-      $form['wysiwyg']['wysiwyg_status'] = array(
+        $form['wysiwyg']['wysiwyg_status'] = array(
         '#type' => 'checkboxes',
         '#title' => t('Text formats enabled for rich-text editing'),
         '#options' => $options,
         '#default_value' => $options_default,
-      );
-      return $form;
+        );
+        return $form;
     }
-  }
-  elseif ($op == 'insert' || $op == 'update') {
+    }
+    elseif ($op == 'insert' || $op == 'update') {
     if (isset($edit['wysiwyg_status'])) {
-      db_query("DELETE FROM {wysiwyg_user} WHERE uid = %d", $account->uid);
-      foreach ($edit['wysiwyg_status'] as $format => $status) {
+        db_query("DELETE FROM {wysiwyg_user} WHERE uid = %d", $account->uid);
+        foreach ($edit['wysiwyg_status'] as $format => $status) {
         db_query("INSERT INTO {wysiwyg_user} (uid, format, status) VALUES (%d, %d, %d)", array(
-          $account->uid,
-          $format,
-          (int) (bool) $status,
+            $account->uid,
+            $format,
+            (int) (bool) $status,
         ));
-      }
+        }
+    }
     }
-  }
 }
 
 function wysiwyg_user_get_status($profile, $account = NULL) {
-  global $user;
+    global $user;
 
-  if (!isset($account)) {
+    if (!isset($account)) {
     $account = $user;
-  }
+    }
 
-  // Default wysiwyg editor status information is only required on forms, so we
-  // do not pre-emptively load and attach this information on every user_load().
-  if (!isset($account->wysiwyg_status)) {
+    // Default wysiwyg editor status information is only required on forms, so we
+    // do not pre-emptively load and attach this information on every user_load().
+    if (!isset($account->wysiwyg_status)) {
     $account->wysiwyg_status = array();
     $result = db_query("SELECT format, status FROM {wysiwyg_user} WHERE uid = %d", $account->uid);
     while ($row = db_fetch_object($result)) {
-      $account->wysiwyg_status[$row->format] = $row->status;
+        $account->wysiwyg_status[$row->format] = $row->status;
+    }
     }
-  }
 
-  if (!empty($profile->settings['user_choose']) && isset($account->wysiwyg_status[$profile->format])) {
+    if (!empty($profile->settings['user_choose']) && isset($account->wysiwyg_status[$profile->format])) {
     $status = $account->wysiwyg_status[$profile->format];
-  }
-  else {
+    }
+    else {
     $status = isset($profile->settings['default']) ? $profile->settings['default'] : TRUE;
-  }
+    }
 
-  return (bool) $status;
+    return (bool) $status;
 }
 
 /**
@@ -772,110 +772,110 @@ 
  *   installed properly.
  */
 function wysiwyg_get_editor($name) {
-  $editors = wysiwyg_get_all_editors();
-  return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : FALSE;
+    $editors = wysiwyg_get_all_editors();
+    return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : FALSE;
 }
 
 /**
  * Compile a list holding all supported editors including installed editor version information.
  */
 function wysiwyg_get_all_editors() {
-  static $editors;
+    static $editors;
 
-  if (isset($editors)) {
+    if (isset($editors)) {
     return $editors;
-  }
+    }
 
-  $editors = wysiwyg_load_includes('editors', 'editor');
-  foreach ($editors as $editor => $properties) {
+    $editors = wysiwyg_load_includes('editors', 'editor');
+    foreach ($editors as $editor => $properties) {
     // Fill in required properties.
     $editors[$editor] += array(
-      'title' => '',
-      'vendor url' => '',
-      'download url' => '',
-      'editor path' => wysiwyg_get_path($editors[$editor]['name']),
-      'library path' => wysiwyg_get_path($editors[$editor]['name']),
-      'libraries' => array(),
-      'version callback' => NULL,
-      'themes callback' => NULL,
-      'settings callback' => NULL,
-      'plugin callback' => NULL,
-      'plugin settings callback' => NULL,
-      'versions' => array(),
-      'js path' => $editors[$editor]['path'] . '/js',
-      'css path' => $editors[$editor]['path'] . '/css',
+        'title' => '',
+        'vendor url' => '',
+        'download url' => '',
+        'editor path' => wysiwyg_get_path($editors[$editor]['name']),
+        'library path' => wysiwyg_get_path($editors[$editor]['name']),
+        'libraries' => array(),
+        'version callback' => NULL,
+        'themes callback' => NULL,
+        'settings callback' => NULL,
+        'plugin callback' => NULL,
+        'plugin settings callback' => NULL,
+        'versions' => array(),
+        'js path' => $editors[$editor]['path'] . '/js',
+        'css path' => $editors[$editor]['path'] . '/css',
     );
     // Check whether library is present.
     if (!($editors[$editor]['installed'] = file_exists($editors[$editor]['library path']))) {
-      continue;
+        continue;
     }
     // Detect library version.
     if (function_exists($editors[$editor]['version callback'])) {
-      $editors[$editor]['installed version'] = $editors[$editor]['version callback']($editors[$editor]);
+        $editors[$editor]['installed version'] = $editors[$editor]['version callback']($editors[$editor]);
     }
     if (empty($editors[$editor]['installed version'])) {
-      $editors[$editor]['error'] = t('The version of %editor could not be detected.', array('%editor' => $properties['title']));
-      $editors[$editor]['installed'] = FALSE;
-      continue;
+        $editors[$editor]['error'] = t('The version of %editor could not be detected.', array('%editor' => $properties['title']));
+        $editors[$editor]['installed'] = FALSE;
+        continue;
     }
     // Determine to which supported version the installed version maps.
     ksort($editors[$editor]['versions']);
     $version = 0;
     foreach ($editors[$editor]['versions'] as $supported_version => $version_properties) {
-      if (version_compare($editors[$editor]['installed version'], $supported_version, '>=')) {
+        if (version_compare($editors[$editor]['installed version'], $supported_version, '>=')) {
         $version = $supported_version;
-      }
+        }
     }
     if (!$version) {
-      $editors[$editor]['error'] = t('The installed version %version of %editor is not supported.', array('%version' => $editors[$editor]['installed version'], '%editor' => $editors[$editor]['title']));
-      $editors[$editor]['installed'] = FALSE;
-      continue;
+        $editors[$editor]['error'] = t('The installed version %version of %editor is not supported.', array('%version' => $editors[$editor]['installed version'], '%editor' => $editors[$editor]['title']));
+        $editors[$editor]['installed'] = FALSE;
+        continue;
     }
     // Apply library version specific definitions and overrides.
     $editors[$editor] = array_merge($editors[$editor], $editors[$editor]['versions'][$version]);
     unset($editors[$editor]['versions']);
-  }
-  return $editors;
+    }
+    return $editors;
 }
 
 /**
  * Invoke hook_wysiwyg_plugin() in all modules.
  */
 function wysiwyg_get_all_plugins() {
-  static $plugins;
+    static $plugins;
 
-  if (isset($plugins)) {
+    if (isset($plugins)) {
     return $plugins;
-  }
+    }
 
-  $plugins = wysiwyg_load_includes('plugins', 'plugin');
-  foreach ($plugins as $name => $properties) {
+    $plugins = wysiwyg_load_includes('plugins', 'plugin');
+    foreach ($plugins as $name => $properties) {
     $plugin = &$plugins[$name];
     // Fill in required/default properties.
     $plugin += array(
-      'title' => $plugin['name'],
-      'vendor url' => '',
-      'js path' => $plugin['path'] . '/' . $plugin['name'],
-      'js file' => $plugin['name'] . '.js',
-      'css path' => $plugin['path'] . '/' . $plugin['name'],
-      'css file' => $plugin['name'] . '.css',
-      'icon path' => $plugin['path'] . '/' . $plugin['name'] . '/images',
-      'icon file' => $plugin['name'] . '.png',
-      'dialog path' => $plugin['name'],
-      'dialog settings' => array(),
-      'settings callback' => NULL,
-      'settings form callback' => NULL,
+        'title' => $plugin['name'],
+        'vendor url' => '',
+        'js path' => $plugin['path'] . '/' . $plugin['name'],
+        'js file' => $plugin['name'] . '.js',
+        'css path' => $plugin['path'] . '/' . $plugin['name'],
+        'css file' => $plugin['name'] . '.css',
+        'icon path' => $plugin['path'] . '/' . $plugin['name'] . '/images',
+        'icon file' => $plugin['name'] . '.png',
+        'dialog path' => $plugin['name'],
+        'dialog settings' => array(),
+        'settings callback' => NULL,
+        'settings form callback' => NULL,
     );
     // Fill in default settings.
     $plugin['settings'] += array(
-      'path' => base_path() . $plugin['path'] . '/' . $plugin['name'],
+        'path' => base_path() . $plugin['path'] . '/' . $plugin['name'],
     );
     // Check whether library is present.
     if (!($plugin['installed'] = file_exists($plugin['js path'] . '/' . $plugin['js file']))) {
-      continue;
+        continue;
+    }
     }
-  }
-  return $plugins;
+    return $plugins;
 }
 
 /**
@@ -891,26 +891,26 @@ 
  * @see wysiwyg_get_directories(), _wysiwyg_process_include()
  */
 function wysiwyg_load_includes($type = 'editors', $hook = 'editor', $file = NULL) {
-  // Determine implementations.
-  $directories = wysiwyg_get_directories($type);
-  $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type;
-  $file_list = array();
-  foreach ($directories as $module => $path) {
+    // Determine implementations.
+    $directories = wysiwyg_get_directories($type);
+    $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type;
+    $file_list = array();
+    foreach ($directories as $module => $path) {
     $file_list[$module] = drupal_system_listing("$file" . '.inc$', $path, 'name', 0);
-  }
+    }
 
-  // Load implementations.
-  $info = array();
-  foreach (array_filter($file_list) as $module => $files) {
+    // Load implementations.
+    $info = array();
+    foreach (array_filter($file_list) as $module => $files) {
     foreach ($files as $file) {
-      include_once './' . $file->filename;
-      $result = _wysiwyg_process_include($module, $module . '_' . $file->name, dirname($file->filename), $hook);
-      if (is_array($result)) {
+        include_once './' . $file->filename;
+        $result = _wysiwyg_process_include($module, $module . '_' . $file->name, dirname($file->filename), $hook);
+        if (is_array($result)) {
         $info = array_merge($info, $result);
-      }
+        }
     }
-  }
-  return $info;
+    }
+    return $info;
 }
 
 /**
@@ -927,20 +927,20 @@ 
  * @ingroup libraries
  */
 function wysiwyg_get_path($library, $base_path = FALSE) {
-  static $libraries;
+    static $libraries;
 
-  if (!isset($libraries)) {
+    if (!isset($libraries)) {
     $libraries = wysiwyg_get_libraries();
-  }
-  if (!isset($libraries[$library])) {
+    }
+    if (!isset($libraries[$library])) {
     // Most often, external libraries can be shared across multiple sites.
     return 'sites/all/libraries/' . $library;
-  }
+    }
 
-  $path = ($base_path ? base_path() : '');
-  $path .= $libraries[$library];
+    $path = ($base_path ? base_path() : '');
+    $path .= $libraries[$library];
 
-  return $path;
+    return $path;
 }
 
 /**
@@ -960,55 +960,55 @@ 
  * @ingroup libraries
  */
 function wysiwyg_get_libraries() {
-  global $profile;
-
-  // When this function is called during Drupal's initial installation process,
-  // the name of the profile that is about to be installed is stored in the
-  // global $profile variable. At all other times, the regular system variable
-  // contains the name of the current profile, and we can call variable_get()
-  // to determine the profile.
-  if (!isset($profile)) {
+    global $profile;
+
+    // When this function is called during Drupal's initial installation process,
+    // the name of the profile that is about to be installed is stored in the
+    // global $profile variable. At all other times, the regular system variable
+    // contains the name of the current profile, and we can call variable_get()
+    // to determine the profile.
+    if (!isset($profile)) {
     $profile = variable_get('install_profile', 'default');
-  }
+    }
 
-  $directory = 'libraries';
-  $searchdir = array();
-  $config = conf_path();
+    $directory = 'libraries';
+    $searchdir = array();
+    $config = conf_path();
 
-  // The 'profiles' directory contains pristine collections of modules and
-  // themes as organized by a distribution.  It is pristine in the same way
-  // that /modules is pristine for core; users should avoid changing anything
-  // there in favor of sites/all or sites/<domain> directories.
-  if (file_exists("profiles/$profile/$directory")) {
+    // The 'profiles' directory contains pristine collections of modules and
+    // themes as organized by a distribution.  It is pristine in the same way
+    // that /modules is pristine for core; users should avoid changing anything
+    // there in favor of sites/all or sites/<domain> directories.
+    if (file_exists("profiles/$profile/$directory")) {
     $searchdir[] = "profiles/$profile/$directory";
-  }
+    }
 
-  // Always search sites/all/*.
-  $searchdir[] = 'sites/all/' . $directory;
+    // Always search sites/all/*.
+    $searchdir[] = 'sites/all/' . $directory;
 
-  // Also search sites/<domain>/*.
-  if (file_exists("$config/$directory")) {
+    // Also search sites/<domain>/*.
+    if (file_exists("$config/$directory")) {
     $searchdir[] = "$config/$directory";
-  }
+    }
 
-  // Retrieve list of directories.
-  // @todo Core: Allow to scan for directories.
-  $directories = array();
-  $nomask = array('CVS');
-  foreach ($searchdir as $dir) {
+    // Retrieve list of directories.
+    // @todo Core: Allow to scan for directories.
+    $directories = array();
+    $nomask = array('CVS');
+    foreach ($searchdir as $dir) {
     if (is_dir($dir) && $handle = opendir($dir)) {
-      while (FALSE !== ($file = readdir($handle))) {
+        while (FALSE !== ($file = readdir($handle))) {
         if (!in_array($file, $nomask) && $file[0] != '.') {
-          if (is_dir("$dir/$file")) {
+            if (is_dir("$dir/$file")) {
             $directories[$file] = "$dir/$file";
-          }
+            }
+        }
         }
-      }
-      closedir($handle);
+        closedir($handle);
+    }
     }
-  }
 
-  return $directories;
+    return $directories;
 }
 
 /**
@@ -1024,14 +1024,14 @@ 
  * @see wysiwyg_load_includes(), _wysiwyg_process_include()
  */
 function wysiwyg_get_directories($plugintype) {
-  $directories = array();
-  foreach (module_implements('wysiwyg_include_directory') as $module) {
+    $directories = array();
+    foreach (module_implements('wysiwyg_include_directory') as $module) {
     $result = module_invoke($module, 'wysiwyg_include_directory', $plugintype);
     if (isset($result) && is_string($result)) {
-      $directories[$module] = drupal_get_path('module', $module) . '/' . $result;
+        $directories[$module] = drupal_get_path('module', $module) . '/' . $result;
     }
-  }
-  return $directories;
+    }
+    return $directories;
 }
 
 /**
@@ -1045,22 +1045,22 @@ 
  *   The name of the hook being invoked.
  */
 function _wysiwyg_process_include($module, $identifier, $path, $hook) {
-  $function = $identifier . '_' . $hook;
-  if (!function_exists($function)) {
+    $function = $identifier . '_' . $hook;
+    if (!function_exists($function)) {
     return NULL;
-  }
-  $result = $function();
-  if (!isset($result) || !is_array($result)) {
+    }
+    $result = $function();
+    if (!isset($result) || !is_array($result)) {
     return NULL;
-  }
+    }
 
-  // Fill in defaults.
-  foreach ($result as $editor => $properties) {
+    // Fill in defaults.
+    foreach ($result as $editor => $properties) {
     $result[$editor]['module'] = $module;
     $result[$editor]['name'] = $editor;
     $result[$editor]['path'] = $path;
-  }
-  return $result;
+    }
+    return $result;
 }
 
 /**
@@ -1079,12 +1079,12 @@ 
  * installed.
  */
 function wysiwyg_features_api() {
-  $return = array();
-  if (module_exists('exportables') && module_exists('ctools')) {
+    $return = array();
+    if (module_exists('exportables') && module_exists('ctools')) {
     module_load_include('inc', 'features', 'includes/features.ctools');
     $return = ctools_component_features_api('wysiwyg');
-  }
-  return $return;
+    }
+    return $return;
 }
 
 /**
@@ -1094,10 +1094,10 @@ 
  */
 function wysiwyg_features_export($data, &$export, $module_name = '') {
 
-  $return = ctools_component_features_export('wysiwyg', $data, $export, $module_name);
-  $export['dependencies']['exportables'] = 'exportables';
+    $return = ctools_component_features_export('wysiwyg', $data, $export, $module_name);
+    $export['dependencies']['exportables'] = 'exportables';
 
-  return $return;
+    return $return;
 }
 
 /**

drupal/sites/default/boinc/modules/contrib/wysiwyg/wysiwyg.dialog.inc

Indentation +33 added lines, -33 removed lines

@@ -9,25 +9,25 @@ 
  * Menu callback; Output a wysiwyg plugin dialog page.
  */
 function wysiwyg_dialog($plugin, $instance) {
-  $plugins = wysiwyg_get_all_plugins();
-  if (!isset($plugins[$plugin])) {
+    $plugins = wysiwyg_get_all_plugins();
+    if (!isset($plugins[$plugin])) {
     return drupal_access_denied();
-  }
-  $callback = $plugin . '_wysiwyg_dialog';
-  if (!function_exists($callback)) {
+    }
+    $callback = $plugin . '_wysiwyg_dialog';
+    if (!function_exists($callback)) {
     return drupal_not_found();
-  }
+    }
 
-  // Suppress admin menu.
-  module_invoke('admin_menu', 'suppress');
-  // Add editor instance id to Drupal.settings.
-  $settings = array(
+    // Suppress admin menu.
+    module_invoke('admin_menu', 'suppress');
+    // Add editor instance id to Drupal.settings.
+    $settings = array(
     'plugin' => $plugin,
     'instance' => $instance,
-  );
-  drupal_add_js(array('wysiwyg' => $settings), 'setting');
+    );
+    drupal_add_js(array('wysiwyg' => $settings), 'setting');
 
-  echo theme('wysiwyg_dialog_page', $callback($instance));
+    echo theme('wysiwyg_dialog_page', $callback($instance));
 }
 
 /**
@@ -38,26 +38,26 @@ 
  * @see template_preprocess()
  */
 function template_preprocess_wysiwyg_dialog_page(&$variables) {
-  // Construct page title
-  $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
+    // Construct page title
+    $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
 
-  $variables['head_title']        = implode(' | ', $head_title);
-  $variables['base_path']         = base_path();
-  $variables['front_page']        = url();
-  // @todo Would a breadcrumb make sense / possible at all?
-  // $variables['breadcrumb']        = theme('breadcrumb', drupal_get_breadcrumb());
-  $variables['head']              = drupal_get_html_head();
-  $variables['help']              = theme('help');
-  $variables['language']          = $GLOBALS['language'];
-  $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
-  $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
-  $variables['site_name']         = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
-  $variables['css']               = drupal_add_css();
-  $variables['styles']            = drupal_get_css();
-  $variables['scripts']           = drupal_get_js();
-  $variables['tabs']              = theme('menu_local_tasks');
-  $variables['title']             = drupal_get_title();
-  // Closure should be filled last.
-  $variables['closure']           = theme('closure');
+    $variables['head_title']        = implode(' | ', $head_title);
+    $variables['base_path']         = base_path();
+    $variables['front_page']        = url();
+    // @todo Would a breadcrumb make sense / possible at all?
+    // $variables['breadcrumb']        = theme('breadcrumb', drupal_get_breadcrumb());
+    $variables['head']              = drupal_get_html_head();
+    $variables['help']              = theme('help');
+    $variables['language']          = $GLOBALS['language'];
+    $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
+    $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
+    $variables['site_name']         = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
+    $variables['css']               = drupal_add_css();
+    $variables['styles']            = drupal_get_css();
+    $variables['scripts']           = drupal_get_js();
+    $variables['tabs']              = theme('menu_local_tasks');
+    $variables['title']             = drupal_get_title();
+    // Closure should be filled last.
+    $variables['closure']           = theme('closure');
 }
 

drupal/sites/default/boinc/modules/contrib/wysiwyg/wysiwyg.api.php

Indentation +23 added lines, -23 removed lines

@@ -36,11 +36,11 @@ 
  *   plugin meta-information as values.
  */
 function hook_wysiwyg_plugin($editor, $version) {
-  switch ($editor) {
+    switch ($editor) {
     case 'tinymce':
       if ($version > 3) {
         return array(
-          'myplugin' => array(
+            'myplugin' => array(
             // A URL to the plugin's homepage.
             'url' => 'http://drupal.org/project/img_assist',
             // The full path to the native editor plugin, no trailing slash.
@@ -54,19 +54,19 @@ 
             // match the corresponding JavaScript implementation. The value is
             // is displayed on the editor configuration form only.
             'buttons' => array(
-              'img_assist' => t('Image Assist'),
+                'img_assist' => t('Image Assist'),
             ),
             // A list of editor extensions provided by this native plugin.
             // Extensions are not displayed as buttons and touch the editor's
             // internals, so you should know what you are doing.
             'extensions' => array(
-              'imce' => t('IMCE'),
+                'imce' => t('IMCE'),
             ),
             // A list of global, native editor configuration settings to
             // override. To be used rarely and only when required.
             'options' => array(
-              'file_browser_callback' => 'imceImageBrowser',
-              'inline_styles' => TRUE,
+                'file_browser_callback' => 'imceImageBrowser',
+                'inline_styles' => TRUE,
             ),
             // Boolean whether the editor needs to load this plugin. When TRUE,
             // the editor will automatically load the plugin based on the 'path'
@@ -81,13 +81,13 @@ 
             'internal' => TRUE,
             // TinyMCE-specific: Additional HTML elements to allow in the markup.
             'extended_valid_elements' => array(
-              'img[class|src|border=0|alt|title|width|height|align|name|style]',
+                'img[class|src|border=0|alt|title|width|height|align|name|style]',
+            ),
             ),
-          ),
         );
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
@@ -101,12 +101,12 @@ 
  *   Wysiwyg module.
  */
 function hook_wysiwyg_include_directory($type) {
-  switch ($type) {
+    switch ($type) {
     case 'plugins':
       // You can just return $type, if you place your Wysiwyg plugins into a
       // sub-directory named 'plugins'.
       return $type;
-  }
+    }
 }
 
 /**
@@ -136,7 +136,7 @@ 
  *   Meta information about the buttons provided by this plugin.
  */
 function hook_INCLUDE_plugin() {
-  $plugins['awesome'] = array(
+    $plugins['awesome'] = array(
     // The plugin's title; defaulting to its internal name ('awesome').
     'title' => t('Awesome plugin'),
     // The (vendor) homepage of this plugin; defaults to ''.
@@ -165,11 +165,11 @@ 
     ),
     // TinyMCE-specific: Additional HTML elements to allow in the markup.
     'extended_valid_elements' => array(
-      'tag1[attribute1|attribute2]',
-      'tag2[attribute3|attribute4]',
+        'tag1[attribute1|attribute2]',
+        'tag2[attribute3|attribute4]',
     ),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 
 /**
@@ -196,11 +196,11 @@ 
  *   - theme: The name of the editor theme/skin.
  */
 function hook_wysiwyg_editor_settings_alter(&$settings, $context) {
-  // Each editor has its own collection of native settings that may be extended
-  // or overridden. Please consult the respective official vendor documentation
-  // for details.
-  if ($context['profile']->editor == 'tinymce') {
+    // Each editor has its own collection of native settings that may be extended
+    // or overridden. Please consult the respective official vendor documentation
+    // for details.
+    if ($context['profile']->editor == 'tinymce') {
     // Supported values to JSON data types.
     $settings['cleanup_on_startup'] = TRUE;
-  }
+    }
 }

drupal/sites/default/boinc/modules/contrib/forum_tweaks/forum_tweaks.module

Indentation +5 added lines, -5 removed lines

@@ -17,14 +17,14 @@
  * Implementation of hook_menu().
  */
 function forum_tweaks_menu() {
-  // Note that this comes straight out of the Advanced Forum module. As such,
-  // it should be removed should said module be added at a future point in time
-  $items['community/forum/%/read'] = array(
+    // Note that this comes straight out of the Advanced Forum module. As such,
+    // it should be removed should said module be added at a future point in time
+    $items['community/forum/%/read'] = array(
     'access callback' => 'forum_tweaks_markasread_access',
     'page arguments' => array(2),
     'page callback' => 'forum_tweaks_markasread',
     'type' => MENU_CALLBACK,
     'file' => 'includes/mark-read.inc',
-  );
-  return $items;
+    );
+    return $items;
 }

drupal/sites/default/boinc/modules/contrib/forum_tweaks/includes/mark-read.inc

Indentation +27 added lines, -27 removed lines

@@ -13,31 +13,31 @@ 
  * Either fill a $links array or return a string version of the link to mark read.
  */
 function forum_tweaks_get_mark_read_link($tid = 0, &$links = array()) {
-  if (forum_tweaks_markasread_access() && !in_array($tid, variable_get('forum_containers', array()))) {
+    if (forum_tweaks_markasread_access() && !in_array($tid, variable_get('forum_containers', array()))) {
     if ($tid) {
-      $links['mark-read']['title'] = t('Mark all topics read');
-      $links['mark-read']['href'] = "community/forum/{$tid}/read";
+        $links['mark-read']['title'] = t('Mark all topics read');
+        $links['mark-read']['href'] = "community/forum/{$tid}/read";
 
-      return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
+        return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
     }
     else {
-      $links['mark-read']['title'] = t('Mark all forums read');
-      $links['mark-read']['href'] = "community/forum/0/read";
+        $links['mark-read']['title'] = t('Mark all forums read');
+        $links['mark-read']['href'] = "community/forum/0/read";
 
-      return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
+        return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
+    }
     }
-  }
 }
 
 /**
  * Marks all posts in forums or in a given forum as read by the current user.
  */
 function forum_tweaks_markasread($current_forum_id = 0) {
-  global $user;
+    global $user;
 
-  // See if we're on a forum or on the forum overview
-  // Path will be /forum/markasread or /forum/markasread/tid
-  if ($current_forum_id) {
+    // See if we're on a forum or on the forum overview
+    // Path will be /forum/markasread or /forum/markasread/tid
+    if ($current_forum_id) {
     // Delete the current history entries so already visited nodes get updated.
     $sql = "DELETE h
             FROM {history} AS h
@@ -58,26 +58,26 @@ 
 
     // Readpath integration
     if (module_exists('readpath')) {
-      readpath_clear_readpath();
+        readpath_clear_readpath();
     }
 
     drupal_set_message(t('All content in this forum has been marked as read'));
     drupal_goto('community/forum/' . $current_forum_id);
-  }
+    }
 
-  // We are on the forum overview, requesting all forums be marked read
-  $forum_vocabulary_id = variable_get('forum_nav_vocabulary', '');
+    // We are on the forum overview, requesting all forums be marked read
+    $forum_vocabulary_id = variable_get('forum_nav_vocabulary', '');
 
-  // Delete the current history entries so already visited nodes get updated.
-  $sql = "DELETE h
+    // Delete the current history entries so already visited nodes get updated.
+    $sql = "DELETE h
           FROM {history} AS h
             INNER JOIN {term_node} AS tn ON (h.nid = tn.nid)
             INNER JOIN {term_data} AS td ON (td.tid = tn.tid)
           WHERE h.uid = %d AND td.vid = %d";
-  db_query($sql, $user->uid, $forum_vocabulary_id);
+    db_query($sql, $user->uid, $forum_vocabulary_id);
 
-  // Update the history table with all forum nodes newer than the cutoff.
-  $sql = "INSERT INTO {history} (uid, nid, timestamp)
+    // Update the history table with all forum nodes newer than the cutoff.
+    $sql = "INSERT INTO {history} (uid, nid, timestamp)
           SELECT DISTINCT %d, n.nid, %d
           FROM {node} AS n
             INNER JOIN {term_node} AS tn ON n.nid=tn.nid
@@ -85,12 +85,12 @@ 
             INNER JOIN {term_data} AS td ON tn.tid = td.tid
           WHERE (n.changed > %d OR ncs.last_comment_timestamp > %d) AND td.vid = %d";
 
-  $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $forum_vocabulary_id);
+    $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $forum_vocabulary_id);
 
-  db_query($sql, $args);
+    db_query($sql, $args);
 
-  drupal_set_message(t('All forum content has been marked as read'));
-  drupal_goto('community/forum');
+    drupal_set_message(t('All forum content has been marked as read'));
+    drupal_goto('community/forum');
 }
 
 /**
@@ -101,6 +101,6 @@ 
  * cached and re-used for other users.
  */
 function forum_tweaks_markasread_access() {
-  global $user;
-  return user_access('access content') && $user->uid;
+    global $user;
+    return user_access('access content') && $user->uid;
 }

drupal/sites/default/boinc/modules/contrib/bbcode/bbcode.module

Indentation +63 added lines, -63 removed lines

@@ -2,38 +2,38 @@ 
 // $Id: bbcode.module,v 1.50 2008/02/07 14:05:30 naudefj Exp $
 
 function bbcode_help($section) {
-  if ($section == 'admin/modules#description')
+    if ($section == 'admin/modules#description')
     return t('Allow the use of BBCode in your posts.');
 }
 
 function bbcode_filter_tips($delta, $format, $long = false) {
-  if ($long) {
+    if ($long) {
     include_once(drupal_get_path('module', 'bbcode') .'/bbcode-help.inc');
     return _bbcode_filter_tip();
-  }
-  else {
+    }
+    else {
     # D5: $output = t('You can use !BBCode tags in the text.', array('!BBCode' =>  l(t('BBCode'), "filter/tips/$format", NULL, NULL, 'filter-bbcode-' . $delta)));
     $output = t('You can use !BBCode (opens in new window) tags in the text.',
-      array(
+        array(
         '!BBCode' =>  l(t('BBCode'), "filter/tips/$format",
         array(
-          'fragment' => 'filter-bbcode-' . $delta,
-	  'attributes' =>
-	    array(
-	      'target'=>'_blank',
-	      'rel'=>'noopener noreferrer',
-	    ),
+            'fragment' => 'filter-bbcode-' . $delta,
+        'attributes' =>
+        array(
+            'target'=>'_blank',
+            'rel'=>'noopener noreferrer',
+        ),
         ))
-      ));
+        ));
     if (variable_get("bbcode_make_links_$format", FALSE)) {
-      $output .= ' '. t('URLs will automatically be converted to links.');
+        $output .= ' '. t('URLs will automatically be converted to links.');
     }
     return $output;
-  }
+    }
 }
 
 function bbcode_filter($op, $delta = 0, $format = -1, $text = '') {
-  switch ($op) {
+    switch ($op) {
     case 'list':
       return array(0 => t('BBCode'));
 
@@ -42,7 +42,7 @@ 
 
     case 'process':
       include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
-      if (variable_get("bbcode_debug_$format", 0)) {
+        if (variable_get("bbcode_debug_$format", 0)) {
         $timing_start = explode(' ', microtime());
         $ret = _bbcode_filter_process($text, $format);
         $timing_stop = explode(' ', microtime());
@@ -50,99 +50,99 @@ 
         $elapsed += $timing_stop[0] - $timing_start[0];
         $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
         return $ret;
-      }
-      else 
+        }
+        else 
         return _bbcode_filter_process($text, $format);
 
     case 'settings':
       $form = array();
-      $form['bbcode_filter'] = array(
+        $form['bbcode_filter'] = array(
         '#type' => 'fieldset', 
         '#title' => t('BBCode filter'), 
         '#collapsible' => TRUE, 
         '#collapsed' => FALSE);
-      $form['bbcode_filter']["bbcode_make_links_$format"] = array(
+        $form['bbcode_filter']["bbcode_make_links_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Convert addresses to links'), 
         '#default_value' => variable_get("bbcode_make_links_$format", 1), 
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('Turn web and e-mail addresses into clickable links. This is useful if content authors do not explicitly mark addresses as links with [url] and [email] tags.'));
-      $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array(
+        $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Spam link deterrent'),
         '#default_value' => variable_get("bbcode_filter_nofollow_$format", 0),
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('If enabled, BBCode will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.'));
-      $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array(
+        $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Email address encoding'), 
         '#default_value' => variable_get("bbcode_encode_mailto_$format", 1), 
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('Whether to encode email addresses with javascript. With this method you will have clickable mailto links, but it will be a bit harder for spam robots to collect them.'));
-      $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array(
+        $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array(
         '#type' => 'select',
         '#title' => t('Smart paragraph and line breaks'),
         '#default_value' => variable_get("bbcode_paragraph_breaks_$format", 2),
         '#options' => array(t('Disabled'), t('Line breaks only'), t('Line and paragraph breaks')),
         '#description' => t('Add line and paragraph breaks to text, excluding text in preformatted code blocks. If you disable this option, you need to enable Drupal\'s "Line break converter". Don\'t use both together!'));
-      $form['bbcode_filter']["bbcode_debug_$format"] = array(
+        $form['bbcode_filter']["bbcode_debug_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Print debugging info'), 
         '#default_value' => variable_get("bbcode_debug_$format", 0), 
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('Print BBCode parse date and execution time. This option should be disabled on production sites. You may need to clear the cache after changing this option.'));
-      return $form;
+        return $form;
 
     default:
       return $text;
-  }
+    }
 }
 
 /* hook_quicktags_alter
  * Alter icons if the quicktags module is enabled
  */
 function bbcode_quicktags_alter($items) {
-  $path = base_path() . drupal_get_path('module','quicktags') .'/';
-  $items['ed_italic'] = array(
-      'name' => 'italic',
-      'prefix' => '[i]',
-      'suffix' => '[/i]',
-      'accesskey' => 'i',
-      'weight' => 10,
-      'icon' => $path .'ed_italic.png',
+    $path = base_path() . drupal_get_path('module','quicktags') .'/';
+    $items['ed_italic'] = array(
+        'name' => 'italic',
+        'prefix' => '[i]',
+        'suffix' => '[/i]',
+        'accesskey' => 'i',
+        'weight' => 10,
+        'icon' => $path .'ed_italic.png',
     );
-  $items['ed_bold'] = array(
-      'name' => 'bold',
-      'prefix' => '[b]',
-      'suffix' => '[/b]',
-      'accesskey' => 'b',
-      'weight' => 20,
-      'icon' => $path .'ed_bold.png',
+    $items['ed_bold'] = array(
+        'name' => 'bold',
+        'prefix' => '[b]',
+        'suffix' => '[/b]',
+        'accesskey' => 'b',
+        'weight' => 20,
+        'icon' => $path .'ed_bold.png',
     );
-  $items['ed_code'] = array(
-      'name' => 'code',
-      'prefix' =>'[code]',
-      'suffix' => '[/code]',
-      'accesskey' => 'c',
-      'weight' => 30,
-      'icon' => $path .'ed_code.png',
+    $items['ed_code'] = array(
+        'name' => 'code',
+        'prefix' =>'[code]',
+        'suffix' => '[/code]',
+        'accesskey' => 'c',
+        'weight' => 30,
+        'icon' => $path .'ed_code.png',
     );
-  $items['ed_block'] = array(
-      'name' => 'quote',
-      'prefix' =>'[quote]',
-      'suffix' => '[/quote]',
-      'accesskey' => 'q',
-      'weight' => 40,
-      'icon' => $path .'ed_block.png',
+    $items['ed_block'] = array(
+        'name' => 'quote',
+        'prefix' =>'[quote]',
+        'suffix' => '[/quote]',
+        'accesskey' => 'q',
+        'weight' => 40,
+        'icon' => $path .'ed_block.png',
     );
-  $items['ed_link'] = array(
-      'name' => 'link',
-      'prefix' =>'[url=http://]',
-      'suffix' => '[/url]',
-      'accesskey' => 'l',
-      'weight' => 50,
-      'icon' => $path .'ed_link.png',
+    $items['ed_link'] = array(
+        'name' => 'link',
+        'prefix' =>'[url=http://]',
+        'suffix' => '[/url]',
+        'accesskey' => 'l',
+        'weight' => 50,
+        'icon' => $path .'ed_link.png',
     );
-  return $items;
+    return $items;
 }
 

drupal/sites/default/boinc/modules/contrib/bbcode/bbcode-help.inc

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: bbcode-help.inc,v 1.8 2007/01/28 21:18:45 naudefj Exp $
 
 function _bbcode_filter_tip() {
-  return t("<a id=\"filter-bbcode\"></a><h2>BBCode Guide</h2>
+    return t("<a id=\"filter-bbcode\"></a><h2>BBCode Guide</h2>
 
 <p>
  BBCode allows you to specify formatting rules for your text,

drupal/sites/default/boinc/modules/contrib/wysiwyg_tweaks/wysiwyg_tweaks.module

Indentation +2 added lines, -2 removed lines

@@ -9,10 +9,10 @@
  * Implementation of hook_wysiwyg_editor_settings_alter().
  */
 function wysiwyg_tweaks_wysiwyg_editor_settings_alter(&$settings, $context) {
-  if ($context['profile']->editor == 'tinymce') {
+    if ($context['profile']->editor == 'tinymce') {
     $settings['browser_spellcheck'] = TRUE;
     $settings['gecko_spellcheck'] = TRUE;
     // Any init setting taking a string, boolean, number, or an array/object
     // holding those types can be overridden/forced here.
-  }
+    }
 }

drupal/sites/default/boinc/modules/contrib/cck/includes/content.crud.inc

Indentation +262 added lines, -262 removed lines

@@ -29,46 +29,46 @@ 
  * Create an array of default values for a field type.
  */
 function content_field_default_values($field_type) {
-  $field_types = _content_field_types();
-  $module = $field_types[$field_type]['module'];
+    $field_types = _content_field_types();
+    $module = $field_types[$field_type]['module'];
 
-  $field = array(
+    $field = array(
     'module' => $module,
     'type' => $field_type,
     'active' => 0,
-  );
+    );
 
-  if (module_exists($module)) {
+    if (module_exists($module)) {
     $field['active'] = 1;
-  }
+    }
 
-  $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
-  // Ensure columns always default to NULL values.
-  foreach ($field['columns'] as $column_name => $column) {
+    $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
+    // Ensure columns always default to NULL values.
+    foreach ($field['columns'] as $column_name => $column) {
     $field['columns'][$column_name]['not null'] = FALSE;
-  }
+    }
 
-  $field['required'] = 0;
-  $field['multiple'] = 0;
-  $field['db_storage'] = CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
+    $field['required'] = 0;
+    $field['multiple'] = 0;
+    $field['db_storage'] = CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
 
-  // Make sure field settings all have an index in the array.
-  $setting_names = (array) module_invoke($module, 'field_settings', 'save', $field);
-  drupal_alter('field_settings', $setting_names, 'save', $field);
-  foreach ($setting_names as $setting) {
+    // Make sure field settings all have an index in the array.
+    $setting_names = (array) module_invoke($module, 'field_settings', 'save', $field);
+    drupal_alter('field_settings', $setting_names, 'save', $field);
+    foreach ($setting_names as $setting) {
     $field[$setting] = NULL;
-  }
-  return $field;
+    }
+    return $field;
 }
 
 /**
  * Create an array of default values for a field instance.
  */
 function content_instance_default_values($field_name, $type_name, $widget_type) {
-  $widget_types = _content_widget_types();
-  $module = $widget_types[$widget_type]['module'];
+    $widget_types = _content_widget_types();
+    $module = $widget_types[$widget_type]['module'];
 
-  $widget = array(
+    $widget = array(
     'field_name' => $field_name,
     'type_name' => $type_name,
     'weight' => 0,
@@ -78,101 +78,101 @@ 
     'widget_module' => $module,
     'display_settings' => array(),
     'widget_settings' => array(),
-  );
+    );
 
-  if (module_exists($module)) {
+    if (module_exists($module)) {
     $widget['widget_active'] = 1;
-  }
+    }
 
-  $settings_names = array_merge(array('label'), array_keys(content_build_modes()));
-  $widget['display_settings'] = array();
-  foreach ($settings_names as $name) {
+    $settings_names = array_merge(array('label'), array_keys(content_build_modes()));
+    $widget['display_settings'] = array();
+    foreach ($settings_names as $name) {
     $widget['display_settings'][$name]['format'] = ($name == 'label') ? 'above' : 'default';
     $widget['display_settings'][$name]['exclude'] = 0;
-  }
+    }
 
-  // Make sure widget settings all have an index in the array.
-  $settings_names = (array) module_invoke($module, 'widget_settings', 'save', $widget);
-  drupal_alter('widget_settings', $settings_names, 'save', $widget);
-  $widget['widget_settings'] = array();
-  foreach ($settings_names as $name) {
+    // Make sure widget settings all have an index in the array.
+    $settings_names = (array) module_invoke($module, 'widget_settings', 'save', $widget);
+    drupal_alter('widget_settings', $settings_names, 'save', $widget);
+    $widget['widget_settings'] = array();
+    foreach ($settings_names as $name) {
     $widget['widget_settings'][$name] = NULL;
-  }
-  return $widget;
+    }
+    return $widget;
 }
 
 /**
  * Expand field info to create field => widget info.
  */
 function content_field_instance_expand($field) {
-  if (isset($field['widget'])) {
+    if (isset($field['widget'])) {
     return $field;
-  }
-  $field['widget'] = !empty($field['widget_settings']) ? $field['widget_settings'] : array();
-  $field['widget']['label'] = !empty($field['label']) ? $field['label'] : $field['field_name'];
-  $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : 0;
-  $field['widget']['description'] = !empty($field['description']) ? $field['description'] : '';
+    }
+    $field['widget'] = !empty($field['widget_settings']) ? $field['widget_settings'] : array();
+    $field['widget']['label'] = !empty($field['label']) ? $field['label'] : $field['field_name'];
+    $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : 0;
+    $field['widget']['description'] = !empty($field['description']) ? $field['description'] : '';
 
-  if (!empty($field['widget_type'])) {
+    if (!empty($field['widget_type'])) {
     $field['widget']['type'] = $field['widget_type'];
     $widget_types = _content_widget_types();
     $field['widget']['module'] = isset($widget_types[$field['widget_type']]['module']) ? $widget_types[$field['widget_type']]['module'] : $field['widget_module'];
-  }
-  elseif (!empty($field['widget_module'])) {
+    }
+    elseif (!empty($field['widget_module'])) {
     $field['widget']['module'] = $field['widget_module'];
-  }
-
-  unset($field['widget_type']);
-  unset($field['weight']);
-  unset($field['label']);
-  unset($field['description']);
-  unset($field['widget_module']);
-  unset($field['widget_settings']);
-
-  // If content.module is handling the default value,
-  // initialize $widget_settings with default values,
-  if (isset($field['default_value']) && isset($field['default_value_php']) &&
+    }
+
+    unset($field['widget_type']);
+    unset($field['weight']);
+    unset($field['label']);
+    unset($field['description']);
+    unset($field['widget_module']);
+    unset($field['widget_settings']);
+
+    // If content.module is handling the default value,
+    // initialize $widget_settings with default values,
+    if (isset($field['default_value']) && isset($field['default_value_php']) &&
       content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
     $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value']  : NULL;
     $field['widget']['default_value_php'] = !empty($field['default_value_php']) ? $field['default_value_php'] : NULL;
     unset($field['default_value']);
     unset($field['default_value_php']);
-  }
-  return $field;
+    }
+    return $field;
 }
 
 /**
  * Collapse field info from field => widget to flattened form values.
  */
 function content_field_instance_collapse($field) {
-  if (!isset($field['widget'])) {
+    if (!isset($field['widget'])) {
     return $field;
-  }
-  $field['widget_settings'] = !empty($field['widget']) ? $field['widget'] : array();
-  $field['widget_type'] = !empty($field['widget']['type']) ? $field['widget']['type'] : '';
-  $field['weight'] = !empty($field['widget']['weight']) ? $field['widget']['weight'] : 0;
-  $field['label'] = !empty($field['widget']['label']) ? $field['widget']['label'] : $field['field_name'];
-  $field['description'] = !empty($field['widget']['description']) ? $field['widget']['description'] : '';
-  $field['type_name'] = !empty($field['type_name']) ? $field['type_name'] : '';
-
-  if (!empty($field['widget']['module'])) {
+    }
+    $field['widget_settings'] = !empty($field['widget']) ? $field['widget'] : array();
+    $field['widget_type'] = !empty($field['widget']['type']) ? $field['widget']['type'] : '';
+    $field['weight'] = !empty($field['widget']['weight']) ? $field['widget']['weight'] : 0;
+    $field['label'] = !empty($field['widget']['label']) ? $field['widget']['label'] : $field['field_name'];
+    $field['description'] = !empty($field['widget']['description']) ? $field['widget']['description'] : '';
+    $field['type_name'] = !empty($field['type_name']) ? $field['type_name'] : '';
+
+    if (!empty($field['widget']['module'])) {
     $widget_module = $field['widget']['module'];
-  }
-  elseif (!empty($field['widget']['type'])) {
+    }
+    elseif (!empty($field['widget']['type'])) {
     $widget_types = _content_widget_types();
     $widget_module = $widget_types[$field['widget']['type']]['module'];
-  }
-  else {
+    }
+    else {
     $widget_module = '';
-  }
-  $field['widget_module'] = $widget_module;
-  unset($field['widget_settings']['type']);
-  unset($field['widget_settings']['weight']);
-  unset($field['widget_settings']['label']);
-  unset($field['widget_settings']['description']);
-  unset($field['widget_settings']['module']);
-  unset($field['widget']);
-  return $field;
+    }
+    $field['widget_module'] = $widget_module;
+    unset($field['widget_settings']['type']);
+    unset($field['widget_settings']['weight']);
+    unset($field['widget_settings']['label']);
+    unset($field['widget_settings']['description']);
+    unset($field['widget_settings']['module']);
+    unset($field['widget']);
+    return $field;
 }
 
 /**
@@ -208,15 +208,15 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_create($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
-  $form_values = $field;
-  $field = content_field_instance_expand($field);
+    $form_values = $field;
+    $field = content_field_instance_expand($field);
 
-  // If there are prior instances, fill out missing values from the prior values,
-  // otherwise get missing values from default values.
-  $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
-  if (!empty($prior_instances) && is_array($prior_instances)) {
+    // If there are prior instances, fill out missing values from the prior values,
+    // otherwise get missing values from default values.
+    $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
+    if (!empty($prior_instances) && is_array($prior_instances)) {
     $prev_field = content_field_instance_expand($prior_instances[0]);
 
     // Weight, label, and description may have been forced into the $field
@@ -226,72 +226,72 @@ 
     $field['widget']['weight'] = isset($form_values['weight']) ? $form_values['weight'] : $prev_field['widget']['weight'];
     $field['widget']['label']  = isset($form_values['label']) ? $form_values['label'] : $prev_field['widget']['label'];
     $field['widget']['description'] = isset($form_values['description']) ? $form_values['description'] : $prev_field['widget']['description'];
-  }
-  else {
+    }
+    else {
     $prev_field = array('widget' => array());
-  }
+    }
 
-  // If we have a field type, we can build default values for this field type.
-  $default_values = array('widget' => array());
-  if (isset($field['type'])) {
+    // If we have a field type, we can build default values for this field type.
+    $default_values = array('widget' => array());
+    if (isset($field['type'])) {
     $default_values = content_field_default_values($field['type']);
     $default_instance_values = content_instance_default_values($field['field_name'], $field['type_name'], $field['widget']['type']);
     $default_values = content_field_instance_expand(array_merge($default_values, $default_instance_values));
-  }
+    }
 
-  // Merge default values, previous values, and current values to create
-  // a complete field array.
-  $widget = array_merge($default_values['widget'], $prev_field['widget'], $field['widget']);
-  $field = array_merge($default_values, $prev_field, $field);
-  $field['widget'] = $widget;
+    // Merge default values, previous values, and current values to create
+    // a complete field array.
+    $widget = array_merge($default_values['widget'], $prev_field['widget'], $field['widget']);
+    $field = array_merge($default_values, $prev_field, $field);
+    $field['widget'] = $widget;
 
-  // Make sure we know what module to invoke for field info.
-  if (empty($field['module']) && !empty($field['type'])) {
+    // Make sure we know what module to invoke for field info.
+    if (empty($field['module']) && !empty($field['type'])) {
     $field_types = _content_field_types();
     $field['module'] = $field_types[$field['type']]['module'];
-  }
+    }
 
-  // The storage type may need to be updated.
-  $field['db_storage'] = content_storage_type($field);
+    // The storage type may need to be updated.
+    $field['db_storage'] = content_storage_type($field);
 
-  // Get a fresh copy of the column information whenever a field is created.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+    // Get a fresh copy of the column information whenever a field is created.
+    $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
-  if (empty($prev_field['widget']) || $prior_instances < 1) {
+    if (empty($prev_field['widget']) || $prior_instances < 1) {
     // If this is the first instance, create the field.
     $field['db_storage'] = $field['multiple'] > 0 ? CONTENT_DB_STORAGE_PER_FIELD : CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
     _content_field_write($field, 'create');
-  }
-  elseif (!empty($prev_field['widget']) && $prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 0) {
+    }
+    elseif (!empty($prev_field['widget']) && $prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 0) {
     // If the database storage has changed, update the field and previous instances.
     $field['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
     foreach ($prior_instances as $instance) {
-      $new_instance = $instance;
-      $new_instance['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
+        $new_instance = $instance;
+        $new_instance['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
-      // Invoke hook_content_fieldapi().
-      module_invoke_all('content_fieldapi', 'update instance', $new_instance);
+        // Invoke hook_content_fieldapi().
+        module_invoke_all('content_fieldapi', 'update instance', $new_instance);
 
-      content_alter_schema($instance, $new_instance);
+        content_alter_schema($instance, $new_instance);
+    }
     }
-  }
 
-  // Invoke hook_content_fieldapi().
-  module_invoke_all('content_fieldapi', 'create instance', $field);
+    // Invoke hook_content_fieldapi().
+    module_invoke_all('content_fieldapi', 'create instance', $field);
 
-  // Update the field and the instance with the latest values.
-  _content_field_write($field, 'update');
-  _content_field_instance_write($field, 'create');
+    // Update the field and the instance with the latest values.
+    _content_field_write($field, 'update');
+    _content_field_instance_write($field, 'create');
 
-  content_alter_schema(array(), $field);
+    content_alter_schema(array(), $field);
 
-  if ($rebuild) {
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 
-  return $field;
+    return $field;
 }
 
 /**
@@ -319,44 +319,44 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_update($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
-  // Ensure the field description is in the 'expanded' form.
-  $field = content_field_instance_expand($field);
+    // Ensure the field description is in the 'expanded' form.
+    $field = content_field_instance_expand($field);
 
-  // Get the previous value from the table.
-  $previous = content_field_instance_read(array('field_name' => $field['field_name'], 'type_name' => $field['type_name']));
-  $prev_field = array_pop($previous);
+    // Get the previous value from the table.
+    $previous = content_field_instance_read(array('field_name' => $field['field_name'], 'type_name' => $field['type_name']));
+    $prev_field = array_pop($previous);
 
-  // Create a complete field array by merging the previous and current values,
-  // letting the current values overwrite the previous ones.
-  $widget = array_merge($prev_field['widget'], $field['widget']);
-  $field = array_merge($prev_field, $field);
-  $field['widget'] = $widget;
+    // Create a complete field array by merging the previous and current values,
+    // letting the current values overwrite the previous ones.
+    $widget = array_merge($prev_field['widget'], $field['widget']);
+    $field = array_merge($prev_field, $field);
+    $field['widget'] = $widget;
 
-  // Make sure we know what module to invoke for field info.
-  if (empty($field['module']) && !empty($field['type'])) {
+    // Make sure we know what module to invoke for field info.
+    if (empty($field['module']) && !empty($field['type'])) {
     $field_types = _content_field_types();
     $field['module'] = $field_types[$field['type']]['module'];
-  }
+    }
 
-  // The storage type may need to be updated.
-  $field['db_storage'] = content_storage_type($field);
+    // The storage type may need to be updated.
+    $field['db_storage'] = content_storage_type($field);
 
-  // Changes in field values may affect columns, or column
-  // information may have changed, get a fresh copy.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+    // Changes in field values may affect columns, or column
+    // information may have changed, get a fresh copy.
+    $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
-  // If the database storage has changed, update the field and previous instances.
-  $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
+    // If the database storage has changed, update the field and previous instances.
+    $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
 
-  if ($prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 1) {
+    if ($prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 1) {
     // Update the field's data storage.
     $field['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
     // Update the schema for prior instances to adapt to the change in db storage.
     foreach ($prior_instances as $instance) {
-      if ($instance['type_name'] != $field['type_name']) {
+        if ($instance['type_name'] != $field['type_name']) {
         $new_instance = $instance;
         $new_instance['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
@@ -364,30 +364,30 @@ 
         module_invoke_all('content_fieldapi', 'update instance', $new_instance);
 
         content_alter_schema($instance, $new_instance);
-      }
+        }
+    }
     }
-  }
 
-  // Invoke hook_content_fieldapi().
-  module_invoke_all('content_fieldapi', 'update instance', $field);
+    // Invoke hook_content_fieldapi().
+    module_invoke_all('content_fieldapi', 'update instance', $field);
 
-  // Update the field and the instance with the latest values.
-  _content_field_write($field, 'update');
-  _content_field_instance_write($field, 'update');
+    // Update the field and the instance with the latest values.
+    _content_field_write($field, 'update');
+    _content_field_instance_write($field, 'update');
 
-  content_alter_schema($prev_field, $field);
+    content_alter_schema($prev_field, $field);
 
-  if ($rebuild) {
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
 
     // The label is in the menu tree, so we need a menu rebuild
     // if the label changes.
     if ($prev_field['widget']['label'] != $field['widget']['label']) {
-      menu_rebuild();
+        menu_rebuild();
+    }
     }
-  }
 
-  return $field;
+    return $field;
 }
 
 /**
@@ -397,30 +397,30 @@ 
  *   The field array to process.
  */
 function _content_field_write($field, $op = 'update') {
-  // Rearrange the data to create the global_settings array.
-  $field['global_settings'] = array();
-  $setting_names = (array) module_invoke($field['module'], 'field_settings', 'save', $field);
-  drupal_alter('field_settings', $setting_names, 'save', $field);
+    // Rearrange the data to create the global_settings array.
+    $field['global_settings'] = array();
+    $setting_names = (array) module_invoke($field['module'], 'field_settings', 'save', $field);
+    drupal_alter('field_settings', $setting_names, 'save', $field);
 
-  foreach ($setting_names as $setting) {
+    foreach ($setting_names as $setting) {
     // Unlike _content_field_instance_write() and 'widget_settings', 'global_settings'
     // is never preexisting, so we take no particular precautions here.
     $field['global_settings'][$setting] = isset($field[$setting]) ? $field[$setting] : '';
     unset($field[$setting]);
-  }
-  // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
-  $field['db_columns'] = $field['columns'];
+    }
+    // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
+    $field['db_columns'] = $field['columns'];
 
-  switch ($op) {
+    switch ($op) {
     case 'create':
       drupal_write_record(content_field_tablename(), $field);
-      break;
+        break;
     case 'update':
       drupal_write_record(content_field_tablename(), $field, 'field_name');
-      break;
-  }
-  unset($field['db_columns']);
-  return $field;
+        break;
+    }
+    unset($field['db_columns']);
+    return $field;
 }
 
 /**
@@ -430,32 +430,32 @@ 
  *   The field array to process.
  */
 function _content_field_instance_write($field, $op = 'update') {
-  // Collapse the field => widget format, so that the values to be saved by
-  // drupal_write_record are on top-level.
-  $field = content_field_instance_collapse($field);
-
-  // Rearrange the data to create the widget_settings array.
-  $setting_names = (array) module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
-  drupal_alter('widget_settings', $setting_names, 'save', $field);
-  foreach ($setting_names as $setting) {
+    // Collapse the field => widget format, so that the values to be saved by
+    // drupal_write_record are on top-level.
+    $field = content_field_instance_collapse($field);
+
+    // Rearrange the data to create the widget_settings array.
+    $setting_names = (array) module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
+    drupal_alter('widget_settings', $setting_names, 'save', $field);
+    foreach ($setting_names as $setting) {
     // In some cases (when the updated $field was originally read from
     // the db, as opposed to gathered from the values of a form), the values
     // are already in the right place, we take care to not wipe them.
     if (isset($field[$setting])) {
-      $field['widget_settings'][$setting] = $field[$setting];
-      unset($field[$setting]);
+        $field['widget_settings'][$setting] = $field[$setting];
+        unset($field[$setting]);
+    }
     }
-  }
 
-  switch ($op) {
+    switch ($op) {
     case 'create':
       drupal_write_record(content_instance_tablename(), $field);
-      break;
+        break;
     case 'update':
       drupal_write_record(content_instance_tablename(), $field, array('field_name', 'type_name'));
-      break;
-  }
-  return $field;
+        break;
+    }
+    return $field;
 }
 
 /**
@@ -473,30 +473,30 @@ 
  *   The field arrays.
  */
 function content_field_instance_read($param = NULL, $include_inactive = FALSE) {
-  $cond = array();
-  $args = array();
-  if (is_array($param)) {
+    $cond = array();
+    $args = array();
+    if (is_array($param)) {
     // Turn the conditions into a query.
     foreach ($param as $key => $value) {
-      $cond[] = 'nfi.'. db_escape_string($key) ." = '%s'";
-      $args[] = $value;
+        $cond[] = 'nfi.'. db_escape_string($key) ." = '%s'";
+        $args[] = $value;
+    }
     }
-  }
-  if (!$include_inactive) {
+    if (!$include_inactive) {
     $cond[] = 'nf.active = 1';
     $cond[] = 'nfi.widget_active = 1';
-  }
-  $where = $cond ? ' WHERE '. implode(' AND ', $cond) : '';
+    }
+    $where = $cond ? ' WHERE '. implode(' AND ', $cond) : '';
 
-  $db_result = db_query("SELECT * FROM {". content_instance_tablename() ."} nfi ".
+    $db_result = db_query("SELECT * FROM {". content_instance_tablename() ."} nfi ".
     " JOIN {". content_field_tablename() ."} nf ON nfi.field_name = nf.field_name ".
     "$where ORDER BY nfi.weight ASC, nfi.label ASC", $args);
 
-  $fields = array();
-  while ($instance = db_fetch_array($db_result)) {
+    $fields = array();
+    while ($instance = db_fetch_array($db_result)) {
     // Unserialize arrays.
     foreach (array('widget_settings', 'display_settings', 'global_settings', 'db_columns') as $key) {
-      $instance[$key] = (!empty($instance[$key])) ? (array) unserialize($instance[$key]) : array();
+        $instance[$key] = (!empty($instance[$key])) ? (array) unserialize($instance[$key]) : array();
     }
     // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
     $instance['columns'] = $instance['db_columns'];
@@ -504,7 +504,7 @@ 
 
     // Unfold 'global_settings'.
     foreach ($instance['global_settings'] as $key => $value) {
-      $instance[$key] = $value;
+        $instance[$key] = $value;
     }
     unset($instance['global_settings']);
 
@@ -515,8 +515,8 @@ 
     // Invoke hook_content_fieldapi().
     module_invoke_all('content_fieldapi', 'read instance', $field);
     $fields[] = $field;
-  }
-  return $fields;
+    }
+    return $fields;
 }
 
 /**
@@ -544,26 +544,26 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_delete($field_name, $type_name, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
-  // Get the previous field value.
-  $field = array_pop(content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name)));
+    // Get the previous field value.
+    $field = array_pop(content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name)));
 
-  // Invoke hook_content_fieldapi().
-  module_invoke_all('content_fieldapi', 'delete instance', $field);
+    // Invoke hook_content_fieldapi().
+    module_invoke_all('content_fieldapi', 'delete instance', $field);
 
-  db_query("DELETE FROM {". content_instance_tablename() .
+    db_query("DELETE FROM {". content_instance_tablename() .
     "} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
 
-  // If no instances remain, delete the field entirely.
-  $instances = content_field_instance_read(array('field_name' => $field_name));
-  if (sizeof($instances) < 1) {
+    // If no instances remain, delete the field entirely.
+    $instances = content_field_instance_read(array('field_name' => $field_name));
+    if (sizeof($instances) < 1) {
     db_query("DELETE FROM {". content_field_tablename() ."} WHERE field_name = '%s'", $field['field_name']);
     content_alter_schema($field, array());
-  }
-  // If only one instance remains, we may need to change the database
-  // representation for this field.
-  elseif (sizeof($instances) == 1 && !($field['multiple'])) {
+    }
+    // If only one instance remains, we may need to change the database
+    // representation for this field.
+    elseif (sizeof($instances) == 1 && !($field['multiple'])) {
     // Multiple-valued fields are always stored per-field-type.
     $instance = $instances[0];
     $new_instance = $instance;
@@ -571,23 +571,23 @@ 
     _content_field_write($new_instance, 'update');
 
     content_alter_schema($instance, $new_instance);
-  }
+    }
 
-  // If the deleted instance was the last field for the content type,
-  // we drop the per-type table. We also consider possibly inactive fields.
-  if (!content_field_instance_read(array('type_name' => $field['type_name']), TRUE)) {
+    // If the deleted instance was the last field for the content type,
+    // we drop the per-type table. We also consider possibly inactive fields.
+    if (!content_field_instance_read(array('type_name' => $field['type_name']), TRUE)) {
     $base_tablename = _content_tablename($field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     if (db_table_exists($base_tablename)) {
-      db_drop_table($ret, $base_tablename);
+        db_drop_table($ret, $base_tablename);
+    }
     }
-  }
 
-  if ($rebuild) {
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 
-  return $field;
+    return $field;
 }
 
 /**
@@ -596,18 +596,18 @@ 
  * @param string $module
  */
 function content_module_delete($module) {
-  // Delete the field data.
-  // If content module has been uninstalled first, all tables
-  // have already been dropped, and running that code will raise errors.
-  if (db_table_exists(content_instance_tablename())) {
+    // Delete the field data.
+    // If content module has been uninstalled first, all tables
+    // have already been dropped, and running that code will raise errors.
+    if (db_table_exists(content_instance_tablename())) {
     $results = db_query("SELECT field_name, type_name FROM {". content_instance_tablename() ."} WHERE widget_module = '%s'", $module);
     while ($field = db_fetch_array($results)) {
-      content_field_instance_delete($field['field_name'], $field['type_name'], FALSE);
+        content_field_instance_delete($field['field_name'], $field['type_name'], FALSE);
     }
     // Force the caches and static arrays to update to the new info.
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 }
 
 /**
@@ -621,8 +621,8 @@ 
  * content_clear_type_cache() can do its job properly.
  */
 function content_type_create($info) {
-  node_get_types(NULL, NULL, TRUE);
-  content_clear_type_cache(TRUE);
+    node_get_types(NULL, NULL, TRUE);
+    content_clear_type_cache(TRUE);
 }
 
 /**
@@ -632,7 +632,7 @@ 
  *   value supplied by hook_node_type()
  */
 function content_type_update($info) {
-  if (!empty($info->old_type) && $info->old_type != $info->type) {
+    if (!empty($info->old_type) && $info->old_type != $info->type) {
     // Rename the content type in all fields that use changed content type.
     db_query("UPDATE {". content_instance_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
 
@@ -641,23 +641,23 @@ 
     $old_name = _content_tablename($old_type['type'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     $new_name = _content_tablename($info->type, CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     if (db_table_exists($old_name)) {
-      $ret = array();
-      db_rename_table($ret, $old_name, $new_name);
-      watchdog('content', 'Content fields table %old_name has been renamed to %new_name and field instances have been updated.', array(
+        $ret = array();
+        db_rename_table($ret, $old_name, $new_name);
+        watchdog('content', 'Content fields table %old_name has been renamed to %new_name and field instances have been updated.', array(
         '%old_name' => $old_name, '%new_name' => $new_name));
     }
 
     // Rename the variable storing weights for non-CCK fields.
     if ($extra = variable_get('content_extra_weights_'. $info->old_type, array())) {
-      variable_set('content_extra_weights_'. $info->type, $extra);
-      variable_del('content_extra_weights_'. $info->old_type);
+        variable_set('content_extra_weights_'. $info->type, $extra);
+        variable_del('content_extra_weights_'. $info->old_type);
+    }
     }
-  }
 
-  // Reset all content type info.
-  // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
-  // node_type_form_submit() takes care of this.
-  content_clear_type_cache(TRUE);
+    // Reset all content type info.
+    // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
+    // node_type_form_submit() takes care of this.
+    content_clear_type_cache(TRUE);
 }
 
 /**
@@ -672,24 +672,24 @@ 
  *
  */
 function content_type_delete($info) {
-  // Don't delete data for content-types defined by disabled modules.
-  if (!empty($info->disabled)) {
+    // Don't delete data for content-types defined by disabled modules.
+    if (!empty($info->disabled)) {
     return;
-  }
+    }
 
-  // TODO : What about inactive fields ?
-  // Currently, content_field_instance_delete doesn't work on those...
-  $fields = content_field_instance_read(array('type_name' => $info->type));
-  foreach ($fields as $field) {
+    // TODO : What about inactive fields ?
+    // Currently, content_field_instance_delete doesn't work on those...
+    $fields = content_field_instance_read(array('type_name' => $info->type));
+    foreach ($fields as $field) {
     content_field_instance_delete($field['field_name'], $info->type, FALSE);
-  }
-  $table = _content_tablename($info->type, CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
-  if (db_table_exists($table)) {
+    }
+    $table = _content_tablename($info->type, CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
+    if (db_table_exists($table)) {
     $ret = array();
     db_drop_table($ret, $table);
     watchdog('content', 'The content fields table %name has been deleted.', array('%name' => $table));
-  }
-  // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
-  // node_type_form_submit() takes care of this.
-  content_clear_type_cache(TRUE);
+    }
+    // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
+    // node_type_form_submit() takes care of this.
+    content_clear_type_cache(TRUE);
 }