BOINC / boinc

drupal/sites/default/boinc/modules/contrib/wysiwyg/plugins/break.inc

Indentation +3 added lines, -3 removed lines

@@ -9,13 +9,13 @@
  * Implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_break_plugin() {
-  $plugins['break'] = array(
+    $plugins['break'] = array(
     'title' => t('Teaser break'),
     'vendor url' => 'http://drupal.org/project/wysiwyg',
     'icon file' => 'break.gif',
     'icon title' => t('Separate the teaser and body of this content'),
     'settings' => array(),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 

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');
 }
 

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
   if (!isset($plugins[$plugin])) {
     return drupal_access_denied();
   }
-  $callback = $plugin . '_wysiwyg_dialog';
+  $callback = $plugin.'_wysiwyg_dialog';
   if (!function_exists($callback)) {
     return drupal_not_found();
   }

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;
-  }
+    }
 }

Switch Indentation +53 added lines, -53 removed lines

@@ -37,56 +37,56 @@ 
  */
 function hook_wysiwyg_plugin($editor, $version) {
   switch ($editor) {
-    case 'tinymce':
-      if ($version > 3) {
-        return 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.
-            // Ignored when 'internal' is set to TRUE below.
-            'path' => drupal_get_path('module', 'img_assist') . '/drupalimage',
-            // The name of the plugin's main JavaScript file.
-            // Ignored when 'internal' is set to TRUE below.
-            // Default value depends on which editor the plugin is for.
-            'filename' => 'editor_plugin.js',
-            // A list of buttons provided by this native plugin. The key has to
-            // match the corresponding JavaScript implementation. The value is
-            // is displayed on the editor configuration form only.
-            'buttons' => array(
-              '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'),
-            ),
-            // 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,
-            ),
-            // Boolean whether the editor needs to load this plugin. When TRUE,
-            // the editor will automatically load the plugin based on the 'path'
-            // variable provided. If FALSE, the plugin either does not need to
-            // be loaded or is already loaded by something else on the page.
-            // Most plugins should define TRUE here.
-            'load' => TRUE,
-            // Boolean whether this plugin is a native plugin, i.e. shipped with
-            // the editor. Definition must be ommitted for plugins provided by
-            // other modules. TRUE means 'path' and 'filename' above are ignored
-            // and the plugin is instead loaded from the editor's plugin folder.
-            '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]',
-            ),
+  case 'tinymce':
+    if ($version > 3) {
+      return 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.
+          // Ignored when 'internal' is set to TRUE below.
+          'path' => drupal_get_path('module', 'img_assist') . '/drupalimage',
+          // The name of the plugin's main JavaScript file.
+          // Ignored when 'internal' is set to TRUE below.
+          // Default value depends on which editor the plugin is for.
+          'filename' => 'editor_plugin.js',
+          // A list of buttons provided by this native plugin. The key has to
+          // match the corresponding JavaScript implementation. The value is
+          // is displayed on the editor configuration form only.
+          'buttons' => array(
+            'img_assist' => t('Image Assist'),
           ),
-        );
-      }
-      break;
+          // 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'),
+          ),
+          // 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,
+          ),
+          // Boolean whether the editor needs to load this plugin. When TRUE,
+          // the editor will automatically load the plugin based on the 'path'
+          // variable provided. If FALSE, the plugin either does not need to
+          // be loaded or is already loaded by something else on the page.
+          // Most plugins should define TRUE here.
+          'load' => TRUE,
+          // Boolean whether this plugin is a native plugin, i.e. shipped with
+          // the editor. Definition must be ommitted for plugins provided by
+          // other modules. TRUE means 'path' and 'filename' above are ignored
+          // and the plugin is instead loaded from the editor's plugin folder.
+          '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]',
+          ),
+        ),
+      );
+    }
+    break;
   }
 }
 
@@ -102,10 +102,10 @@ 
  */
 function hook_wysiwyg_include_directory($type) {
   switch ($type) {
-    case 'plugins':
-      // You can just return $type, if you place your Wysiwyg plugins into a
-      // sub-directory named 'plugins'.
-      return $type;
+  case 'plugins':
+    // You can just return $type, if you place your Wysiwyg plugins into a
+    // sub-directory named 'plugins'.
+    return $type;
   }
 }
 

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
             'url' => 'http://drupal.org/project/img_assist',
             // The full path to the native editor plugin, no trailing slash.
             // Ignored when 'internal' is set to TRUE below.
-            'path' => drupal_get_path('module', 'img_assist') . '/drupalimage',
+            'path' => drupal_get_path('module', 'img_assist').'/drupalimage',
             // The name of the plugin's main JavaScript file.
             // Ignored when 'internal' is set to TRUE below.
             // Default value depends on which editor the plugin is for.
@@ -150,13 +150,13 @@ 
     'icon title' => t('Do something'),
     // An alternative path to the integration JavaScript; defaults to
     // '[path-to-module]/[plugins-directory]/[plugin-name]'.
-    'js path' => drupal_get_path('module', 'mymodule') . '/awesomeness',
+    'js path' => drupal_get_path('module', 'mymodule').'/awesomeness',
     // An alternative filename of the integration JavaScript; defaults to
     // '[plugin-name].js'.
     'js file' => 'awesome.js',
     // An alternative path to the integration stylesheet; defaults to
     // '[path-to-module]/[plugins-directory]/[plugin-name]'.
-    'css path' => drupal_get_path('module', 'mymodule') . '/awesomeness',
+    'css path' => drupal_get_path('module', 'mymodule').'/awesomeness',
     // An alternative filename of the integration stylesheet; defaults to
     // '[plugin-name].css'.
     'css file' => 'awesome.css',

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -66,19 +66,19 @@ 
             // override. To be used rarely and only when required.
             'options' => array(
               'file_browser_callback' => 'imceImageBrowser',
-              'inline_styles' => TRUE,
+              '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'
             // variable provided. If FALSE, the plugin either does not need to
             // be loaded or is already loaded by something else on the page.
             // Most plugins should define TRUE here.
-            'load' => TRUE,
+            'load' => true,
             // Boolean whether this plugin is a native plugin, i.e. shipped with
             // the editor. Definition must be ommitted for plugins provided by
             // other modules. TRUE means 'path' and 'filename' above are ignored
             // and the plugin is instead loaded from the editor's plugin folder.
-            'internal' => TRUE,
+            '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]',
@@ -201,6 +201,6 @@ 
   // for details.
   if ($context['profile']->editor == 'tinymce') {
     // Supported values to JSON data types.
-    $settings['cleanup_on_startup'] = TRUE;
+    $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;
 }

Spacing +3 added lines, -3 removed lines

@@ -18,13 +18,13 @@ 
       $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";
 
-      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));
     }
   }
 }
@@ -62,7 +62,7 @@ 
     }
 
     drupal_set_message(t('All content in this forum has been marked as read'));
-    drupal_goto('community/forum/' . $current_forum_id);
+    drupal_goto('community/forum/'.$current_forum_id);
   }
 
   // We are on the forum overview, requesting all forums be marked read

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       $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));
-    }
-    else {
+    } else {
       $links['mark-read']['title'] = t('Mark all forums read');
       $links['mark-read']['href'] = "community/forum/0/read";
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -18,13 +18,13 @@
       $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";
 
-      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));
     }
   }
 }

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;
 }
 

Switch Indentation +57 added lines, -57 removed lines

@@ -34,67 +34,67 @@
 
 function bbcode_filter($op, $delta = 0, $format = -1, $text = '') {
   switch ($op) {
-    case 'list':
-      return array(0 => t('BBCode'));
+  case 'list':
+    return array(0 => t('BBCode'));
 
-    case 'description':
-      return t('Converts BBCode to HTML.');
+  case 'description':
+    return t('Converts BBCode to HTML.');
 
-    case 'process':
-      include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
-      if (variable_get("bbcode_debug_$format", 0)) {
-        $timing_start = explode(' ', microtime());
-        $ret = _bbcode_filter_process($text, $format);
-        $timing_stop = explode(' ', microtime());
-        $elapsed = $timing_stop[1] - $timing_start[1];
-        $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 
-        return _bbcode_filter_process($text, $format);
+  case 'process':
+    include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
+    if (variable_get("bbcode_debug_$format", 0)) {
+      $timing_start = explode(' ', microtime());
+      $ret = _bbcode_filter_process($text, $format);
+      $timing_stop = explode(' ', microtime());
+      $elapsed = $timing_stop[1] - $timing_start[1];
+      $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 
+      return _bbcode_filter_process($text, $format);
 
-    case 'settings':
-      $form = array();
-      $form['bbcode_filter'] = array(
-        '#type' => 'fieldset', 
-        '#title' => t('BBCode filter'), 
-        '#collapsible' => TRUE, 
-        '#collapsed' => FALSE);
-      $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(
-        '#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(
-        '#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(
-        '#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(
-        '#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;
+  case 'settings':
+    $form = array();
+    $form['bbcode_filter'] = array(
+      '#type' => 'fieldset', 
+      '#title' => t('BBCode filter'), 
+      '#collapsible' => TRUE, 
+      '#collapsed' => FALSE);
+    $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(
+      '#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(
+      '#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(
+      '#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(
+      '#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;
 
-    default:
-      return $text;
+  default:
+    return $text;
   }
 }
 

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 
 function bbcode_filter_tips($delta, $format, $long = false) {
   if ($long) {
-    include_once(drupal_get_path('module', 'bbcode') .'/bbcode-help.inc');
+    include_once(drupal_get_path('module', 'bbcode').'/bbcode-help.inc');
     return _bbcode_filter_tip();
   }
   else {
@@ -17,7 +17,7 @@ 
       array(
         '!BBCode' =>  l(t('BBCode'), "filter/tips/$format",
         array(
-          'fragment' => 'filter-bbcode-' . $delta,
+          'fragment' => 'filter-bbcode-'.$delta,
 	  'attributes' =>
 	    array(
 	      'target'=>'_blank',
@@ -26,7 +26,7 @@ 
         ))
       ));
     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;
   }
@@ -41,14 +41,14 @@ 
       return t('Converts BBCode to HTML.');
 
     case 'process':
-      include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
+      include_once(drupal_get_path('module', 'bbcode').'/bbcode-filter.inc');
       if (variable_get("bbcode_debug_$format", 0)) {
         $timing_start = explode(' ', microtime());
         $ret = _bbcode_filter_process($text, $format);
         $timing_stop = explode(' ', microtime());
         $elapsed = $timing_stop[1] - $timing_start[1];
         $elapsed += $timing_stop[0] - $timing_start[0];
-        $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
+        $ret .= '<hr />'.l('BBCode', "filter/tips/$format").' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
         return $ret;
       }
       else 
@@ -102,14 +102,14 @@ 
  * Alter icons if the quicktags module is enabled
  */
 function bbcode_quicktags_alter($items) {
-  $path = base_path() . drupal_get_path('module','quicktags') .'/';
+  $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',
+      'icon' => $path.'ed_italic.png',
     );
   $items['ed_bold'] = array(
       'name' => 'bold',
@@ -117,7 +117,7 @@ 
       'suffix' => '[/b]',
       'accesskey' => 'b',
       'weight' => 20,
-      'icon' => $path .'ed_bold.png',
+      'icon' => $path.'ed_bold.png',
     );
   $items['ed_code'] = array(
       'name' => 'code',
@@ -125,7 +125,7 @@ 
       'suffix' => '[/code]',
       'accesskey' => 'c',
       'weight' => 30,
-      'icon' => $path .'ed_code.png',
+      'icon' => $path.'ed_code.png',
     );
   $items['ed_block'] = array(
       'name' => 'quote',
@@ -133,7 +133,7 @@ 
       'suffix' => '[/quote]',
       'accesskey' => 'q',
       'weight' => 40,
-      'icon' => $path .'ed_block.png',
+      'icon' => $path.'ed_block.png',
     );
   $items['ed_link'] = array(
       'name' => 'link',
@@ -141,7 +141,7 @@ 
       'suffix' => '[/url]',
       'accesskey' => 'l',
       'weight' => 50,
-      'icon' => $path .'ed_link.png',
+      'icon' => $path.'ed_link.png',
     );
   return $items;
 }

Braces +2 added lines, -4 removed lines

@@ -10,8 +10,7 @@ 
   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(
@@ -50,8 +49,7 @@ 
         $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':

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	    ),
         ))
       ));
-    if (variable_get("bbcode_make_links_$format", FALSE)) {
+    if (variable_get("bbcode_make_links_$format", false)) {
       $output .= ' '. t('URLs will automatically be converted to links.');
     }
     return $output;
@@ -59,8 +59,8 @@ 
       $form['bbcode_filter'] = array(
         '#type' => 'fieldset', 
         '#title' => t('BBCode filter'), 
-        '#collapsible' => TRUE, 
-        '#collapsed' => FALSE);
+        '#collapsible' => true, 
+        '#collapsed' => false);
       $form['bbcode_filter']["bbcode_make_links_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Convert addresses to links'), 

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.
-  }
+    }
 }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
  */
 function wysiwyg_tweaks_wysiwyg_editor_settings_alter(&$settings, $context) {
   if ($context['profile']->editor == 'tinymce') {
-    $settings['browser_spellcheck'] = TRUE;
-    $settings['gecko_spellcheck'] = TRUE;
+    $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);
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -412,12 +412,12 @@ 
   $field['db_columns'] = $field['columns'];
 
   switch ($op) {
-    case 'create':
-      drupal_write_record(content_field_tablename(), $field);
-      break;
-    case 'update':
-      drupal_write_record(content_field_tablename(), $field, 'field_name');
-      break;
+  case 'create':
+    drupal_write_record(content_field_tablename(), $field);
+    break;
+  case 'update':
+    drupal_write_record(content_field_tablename(), $field, 'field_name');
+    break;
   }
   unset($field['db_columns']);
   return $field;
@@ -448,12 +448,12 @@ 
   }
 
   switch ($op) {
-    case 'create':
-      drupal_write_record(content_instance_tablename(), $field);
-      break;
-    case 'update':
-      drupal_write_record(content_instance_tablename(), $field, array('field_name', 'type_name'));
-      break;
+  case 'create':
+    drupal_write_record(content_instance_tablename(), $field);
+    break;
+  case 'update':
+    drupal_write_record(content_instance_tablename(), $field, array('field_name', 'type_name'));
+    break;
   }
   return $field;
 }

Spacing +23 added lines, -23 removed lines

@@ -42,7 +42,7 @@ 
     $field['active'] = 1;
   }
 
-  $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
+  $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;
@@ -53,7 +53,7 @@ 
   $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);
+  $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;
@@ -92,7 +92,7 @@ 
   }
 
   // Make sure widget settings all have an index in the array.
-  $settings_names = (array) module_invoke($module, 'widget_settings', 'save', $widget);
+  $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) {
@@ -133,7 +133,7 @@ 
   // 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'] = !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']);
@@ -208,7 +208,7 @@ 
  * @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);
@@ -255,7 +255,7 @@ 
   $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);
+  $field['columns'] = (array)module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
   if (empty($prev_field['widget']) || $prior_instances < 1) {
     // If this is the first instance, create the field.
@@ -319,7 +319,7 @@ 
  * @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);
@@ -345,7 +345,7 @@ 
 
   // 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);
+  $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']));
@@ -399,7 +399,7 @@ 
 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);
+  $setting_names = (array)module_invoke($field['module'], 'field_settings', 'save', $field);
   drupal_alter('field_settings', $setting_names, 'save', $field);
 
   foreach ($setting_names as $setting) {
@@ -435,7 +435,7 @@ 
   $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);
+  $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
@@ -478,7 +478,7 @@ 
   if (is_array($param)) {
     // Turn the conditions into a query.
     foreach ($param as $key => $value) {
-      $cond[] = 'nfi.'. db_escape_string($key) ." = '%s'";
+      $cond[] = 'nfi.'.db_escape_string($key)." = '%s'";
       $args[] = $value;
     }
   }
@@ -486,17 +486,17 @@ 
     $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 ".
-    " JOIN {". content_field_tablename() ."} nf ON nfi.field_name = nf.field_name ".
+  $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)) {
     // 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'];
@@ -544,7 +544,7 @@ 
  * @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)));
@@ -552,13 +552,13 @@ 
   // 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) {
-    db_query("DELETE FROM {". content_field_tablename() ."} WHERE field_name = '%s'", $field['field_name']);
+    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
@@ -600,7 +600,7 @@ 
   // 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);
+    $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);
     }
@@ -634,7 +634,7 @@ 
 function content_type_update($info) {
   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));
+    db_query("UPDATE {".content_instance_tablename()."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
 
     // Rename the content fields table to match new content type name.
     $old_type = content_types($info->old_type);
@@ -648,9 +648,9 @@ 
     }
 
     // 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);
+    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);
     }
   }
 

Braces +5 added lines, -10 removed lines

@@ -117,8 +117,7 @@ 
     $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'];
   }
 
@@ -157,12 +156,10 @@ 
 
   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;
@@ -226,8 +223,7 @@ 
     $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());
   }
 
@@ -261,8 +257,7 @@ 
     // 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;
 

Upper-Lower-Casing +20 added lines, -20 removed lines

@@ -45,7 +45,7 @@ 
   $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['columns'][$column_name]['not null'] = false;
   }
 
   $field['required'] = 0;
@@ -56,7 +56,7 @@ 
   $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;
+    $field[$setting] = null;
   }
   return $field;
 }
@@ -96,7 +96,7 @@ 
   drupal_alter('widget_settings', $settings_names, 'save', $widget);
   $widget['widget_settings'] = array();
   foreach ($settings_names as $name) {
-    $widget['widget_settings'][$name] = NULL;
+    $widget['widget_settings'][$name] = null;
   }
   return $widget;
 }
@@ -133,8 +133,8 @@ 
   // 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;
+    $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']);
   }
@@ -207,7 +207,7 @@ 
  * @see content_clear_type_cache()
  * @see menu_rebuild()
  */
-function content_field_instance_create($field, $rebuild = TRUE) {
+function content_field_instance_create($field, $rebuild = true) {
   include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
   $form_values = $field;
@@ -287,7 +287,7 @@ 
   content_alter_schema(array(), $field);
 
   if ($rebuild) {
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
     menu_rebuild();
   }
 
@@ -318,7 +318,7 @@ 
  * @see content_clear_type_cache()
  * @see menu_rebuild()
  */
-function content_field_instance_update($field, $rebuild = TRUE) {
+function content_field_instance_update($field, $rebuild = true) {
   include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
   // Ensure the field description is in the 'expanded' form.
@@ -378,7 +378,7 @@ 
   content_alter_schema($prev_field, $field);
 
   if ($rebuild) {
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
 
     // The label is in the menu tree, so we need a menu rebuild
     // if the label changes.
@@ -472,7 +472,7 @@ 
  * @return
  *   The field arrays.
  */
-function content_field_instance_read($param = NULL, $include_inactive = FALSE) {
+function content_field_instance_read($param = null, $include_inactive = false) {
   $cond = array();
   $args = array();
   if (is_array($param)) {
@@ -543,7 +543,7 @@ 
  * @see content_clear_type_cache()
  * @see menu_rebuild()
  */
-function content_field_instance_delete($field_name, $type_name, $rebuild = TRUE) {
+function content_field_instance_delete($field_name, $type_name, $rebuild = true) {
   include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
   // Get the previous field value.
@@ -575,7 +575,7 @@ 
 
   // 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 (!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);
@@ -583,7 +583,7 @@ 
   }
 
   if ($rebuild) {
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
     menu_rebuild();
   }
 
@@ -602,10 +602,10 @@ 
   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);
+    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);
 }
 
 /**
@@ -657,7 +657,7 @@ 
   // 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);
+  content_clear_type_cache(true);
 }
 
 /**
@@ -681,7 +681,7 @@ 
   // 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);
+    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)) {
@@ -691,5 +691,5 @@ 
   }
   // 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);
+  content_clear_type_cache(true);
 }