BOINC / boinc

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

Doc Comments +1 added lines

@@ -68,6 +68,7 @@
  * custom multiple value widgets but don't need any other special multiple
  * values handling. This will call the field generation function
  * a random number of times and compile the results into a node array.
+ * @param string $function
  */
 function content_devel_multiple($function, $node, $field) {
   $node_field = array();

Indentation +85 added lines, -85 removed lines

@@ -19,48 +19,48 @@ 
  * information in each of its CCK fields.
  **/
 function content_generate_fields(&$node, $field) {
-  $type_name = $node->type;
-  $type = content_types($type_name);
-  $field_types = _content_field_types();
+    $type_name = $node->type;
+    $type = content_types($type_name);
+    $field_types = _content_field_types();
 
-  if (!empty($type['fields'])) {
+    if (!empty($type['fields'])) {
     foreach ($type['fields'] as $field) {
-      $node_field = array();
-      // If module handles own multiples, then only call its hook once.
-      if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
+        $node_field = array();
+        // If module handles own multiples, then only call its hook once.
+        if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
         $max = 0;
-      }
-      else {
+        }
+        else {
         switch ($field['multiple']) {
-          case 0:
+            case 0:
             $max = 0;
             break;
-          case 1:
+            case 1:
             $max = rand(0, 3); //just an arbitrary number for 'unlimited'
             break;
-          default:
+            default:
             $max = $field['multiple'];
             break;
         }
-      }
-      for ($i = 0; $i <= $max; $i++) {
+        }
+        for ($i = 0; $i <= $max; $i++) {
         $module = $field_types[$field['type']]['module'];
         $function = $module .'_content_generate';
         if (function_exists($function)) {
-          $result = $function($node, $field); // $items, $teaser, $page
-          if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
+            $result = $function($node, $field); // $items, $teaser, $page
+            if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
             // Fields that handle their own multiples will add their own deltas.
             $node_field = $result;
-          }
-          else {
+            }
+            else {
             // When multiples are handled by the content module, add a delta for each result.
             $node_field[$i] = $result;
-          }
+            }
         }
-      }
-      $node->{$field['field_name']} = $node_field;
+        }
+        $node->{$field['field_name']} = $node_field;
+    }
     }
-  }
 }
 
 /**
@@ -70,149 +70,149 @@ 
  * a random number of times and compile the results into a node array.
  */
 function content_devel_multiple($function, $node, $field) {
-  $node_field = array();
-  if (function_exists($function)) {
+    $node_field = array();
+    if (function_exists($function)) {
     switch ($field['multiple']) {
-      case 0:
+        case 0:
         $max = 0;
         break;
-      case 1:
+        case 1:
         $max = rand(0, 3); //just an arbitrary number for 'unlimited'
         break;
-      default:
+        default:
         $max = $field['multiple'];
         break;
     }
     for ($i = 0; $i <= $max; $i++) {
-      $node_field[$i] = $function($node, $field);
+        $node_field[$i] = $function($node, $field);
+    }
     }
-  }
-  return $node_field;
+    return $node_field;
 }
 
 if (module_exists('text')) {
-  function text_content_generate($node, $field) {
+    function text_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_text_content_generate', $node, $field);
+        return content_devel_multiple('_text_content_generate', $node, $field);
     }
     else {
-      return _text_content_generate($node, $field);
+        return _text_content_generate($node, $field);
+    }
     }
-  }
 
-  function _text_content_generate($node, $field) {
+    function _text_content_generate($node, $field) {
     $node_field = array();
     if ($field['widget']['type'] == 'text_textarea') {
-      $format = $field['text_processing'] ? rand(0, 3) : 0;
-      $node_field['value'] = devel_create_content($format);
-      $node_field['format'] = $format;
+        $format = $field['text_processing'] ? rand(0, 3) : 0;
+        $node_field['value'] = devel_create_content($format);
+        $node_field['format'] = $format;
     }
     else {
-      $allowed_values = content_allowed_values($field);
-      if (!empty($allowed_values)) {
+        $allowed_values = content_allowed_values($field);
+        if (!empty($allowed_values)) {
         // Just pick one of the specified allowed values.
         $node_field['value'] = array_rand($allowed_values);
-      }
-      else {
+        }
+        else {
         // Generate a value that respects max_length.
         if (empty($field['max_length'])) {
-          $field['max_length'] = 12;
+            $field['max_length'] = 12;
         }
         $node_field['value'] = user_password($field['max_length']);
-      }
+        }
     }
     return $node_field;
-  }
+    }
 }
 
 if (module_exists('number')) {
-  function number_content_generate($node, $field) {
+    function number_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_number_content_generate', $node, $field);
+        return content_devel_multiple('_number_content_generate', $node, $field);
     }
     else {
-      return _number_content_generate($node, $field);
+        return _number_content_generate($node, $field);
+    }
     }
-  }
 
-  function _number_content_generate($node, $field) {
+    function _number_content_generate($node, $field) {
     $node_field = array();
     $allowed_values = content_allowed_values($field);
     if (!empty($allowed_values)) {
-      // Just pick one of the specified allowed values.
-      $node_field['value'] = array_rand($allowed_values);
+        // Just pick one of the specified allowed values.
+        $node_field['value'] = array_rand($allowed_values);
     }
     else {
-      $min = is_numeric($field['min']) ? $field['min'] : 0;
-      switch ($field['type']) {
+        $min = is_numeric($field['min']) ? $field['min'] : 0;
+        switch ($field['type']) {
         case 'number_integer':
           $max = is_numeric($field['max']) ? $field['max'] : 10000;
-          $decimal = 0;
-          $scale = 0;
-          break;
+            $decimal = 0;
+            $scale = 0;
+            break;
 
         case 'number_decimal':
           $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
-          $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          $decimal = rand(0, (10 * $scale)) / 100;
-          break;
+            $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
+            $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+            $decimal = rand(0, (10 * $scale)) / 100;
+            break;
 
         case 'number_float':
           $precision = rand(10, 32);
-          $scale = rand(0, 2);
-          $decimal = rand(0, (10 * $scale)) / 100;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          break;
-      }
-      $node_field['value'] = round((rand($min, $max) + $decimal), $scale);
+            $scale = rand(0, 2);
+            $decimal = rand(0, (10 * $scale)) / 100;
+            $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+            break;
+        }
+        $node_field['value'] = round((rand($min, $max) + $decimal), $scale);
     }
     return $node_field;
-  }
+    }
 }
 
 if (module_exists('nodereference')) {
-  function nodereference_content_generate($node, $field) {
+    function nodereference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_nodereference_content_generate', $node, $field);
+        return content_devel_multiple('_nodereference_content_generate', $node, $field);
     }
     else {
-      return _nodereference_content_generate($node, $field);
+        return _nodereference_content_generate($node, $field);
+    }
     }
-  }
 
-  function _nodereference_content_generate($node, $field) {
+    function _nodereference_content_generate($node, $field) {
     $node_field = array();
     $allowed_values = nodereference_allowed_values($field);
     unset($allowed_values[0]);
     if (!empty($allowed_values)) {
-      // Just pick one of the specified allowed values.
-      $node_field['nid'] = array_rand($allowed_values);
+        // Just pick one of the specified allowed values.
+        $node_field['nid'] = array_rand($allowed_values);
     }
     return $node_field;
-  }
+    }
 }
 
 if (module_exists('userreference')) {
-  function userreference_content_generate($node, $field) {
+    function userreference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_userreference_content_generate', $node, $field);
+        return content_devel_multiple('_userreference_content_generate', $node, $field);
     }
     else {
-      return _userreference_content_generate($node, $field);
+        return _userreference_content_generate($node, $field);
+    }
     }
-  }
 
-  function _userreference_content_generate($node, $field) {
+    function _userreference_content_generate($node, $field) {
     $node_field = array();
     $allowed_values = userreference_allowed_values($field);
     if (isset($allowed_values['none'])) {
-      unset($allowed_values['none']);
+        unset($allowed_values['none']);
     }
     if (!empty($allowed_values)) {
-      // Just pick one of the specified allowed values.
-      $node_field['uid'] = array_rand($allowed_values);
+        // Just pick one of the specified allowed values.
+        $node_field['uid'] = array_rand($allowed_values);
     }
     return $node_field;
-  }
+    }
 }
\ No newline at end of file

Switch Indentation +35 added lines, -35 removed lines

@@ -32,15 +32,15 @@ 
       }
       else {
         switch ($field['multiple']) {
-          case 0:
-            $max = 0;
-            break;
-          case 1:
-            $max = rand(0, 3); //just an arbitrary number for 'unlimited'
-            break;
-          default:
-            $max = $field['multiple'];
-            break;
+        case 0:
+          $max = 0;
+          break;
+        case 1:
+          $max = rand(0, 3); //just an arbitrary number for 'unlimited'
+          break;
+        default:
+          $max = $field['multiple'];
+          break;
         }
       }
       for ($i = 0; $i <= $max; $i++) {
@@ -73,15 +73,15 @@ 
   $node_field = array();
   if (function_exists($function)) {
     switch ($field['multiple']) {
-      case 0:
-        $max = 0;
-        break;
-      case 1:
-        $max = rand(0, 3); //just an arbitrary number for 'unlimited'
-        break;
-      default:
-        $max = $field['multiple'];
-        break;
+    case 0:
+      $max = 0;
+      break;
+    case 1:
+      $max = rand(0, 3); //just an arbitrary number for 'unlimited'
+      break;
+    default:
+      $max = $field['multiple'];
+      break;
     }
     for ($i = 0; $i <= $max; $i++) {
       $node_field[$i] = $function($node, $field);
@@ -145,25 +145,25 @@ 
     else {
       $min = is_numeric($field['min']) ? $field['min'] : 0;
       switch ($field['type']) {
-        case 'number_integer':
-          $max = is_numeric($field['max']) ? $field['max'] : 10000;
-          $decimal = 0;
-          $scale = 0;
-          break;
+      case 'number_integer':
+        $max = is_numeric($field['max']) ? $field['max'] : 10000;
+        $decimal = 0;
+        $scale = 0;
+        break;
 
-        case 'number_decimal':
-          $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
-          $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          $decimal = rand(0, (10 * $scale)) / 100;
-          break;
+      case 'number_decimal':
+        $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
+        $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
+        $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+        $decimal = rand(0, (10 * $scale)) / 100;
+        break;
 
-        case 'number_float':
-          $precision = rand(10, 32);
-          $scale = rand(0, 2);
-          $decimal = rand(0, (10 * $scale)) / 100;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          break;
+      case 'number_float':
+        $precision = rand(10, 32);
+        $scale = rand(0, 2);
+        $decimal = rand(0, (10 * $scale)) / 100;
+        $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+        break;
       }
       $node_field['value'] = round((rand($min, $max) + $decimal), $scale);
     }

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
       }
       for ($i = 0; $i <= $max; $i++) {
         $module = $field_types[$field['type']]['module'];
-        $function = $module .'_content_generate';
+        $function = $module.'_content_generate';
         if (function_exists($function)) {
           $result = $function($node, $field); // $items, $teaser, $page
           if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
@@ -155,13 +155,13 @@ 
           $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
           $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
           $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          $decimal = rand(0, (10 * $scale)) / 100;
+          $decimal = rand(0, (10*$scale))/100;
           break;
 
         case 'number_float':
           $precision = rand(10, 32);
           $scale = rand(0, 2);
-          $decimal = rand(0, (10 * $scale)) / 100;
+          $decimal = rand(0, (10*$scale))/100;
           $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
           break;
       }

Braces +9 added lines, -18 removed lines

@@ -29,8 +29,7 @@ 
       // If module handles own multiples, then only call its hook once.
       if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
         $max = 0;
-      }
-      else {
+      } else {
         switch ($field['multiple']) {
           case 0:
             $max = 0;
@@ -51,8 +50,7 @@ 
           if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
             // Fields that handle their own multiples will add their own deltas.
             $node_field = $result;
-          }
-          else {
+          } else {
             // When multiples are handled by the content module, add a delta for each result.
             $node_field[$i] = $result;
           }
@@ -94,8 +92,7 @@ 
   function text_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_text_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _text_content_generate($node, $field);
     }
   }
@@ -106,14 +103,12 @@ 
       $format = $field['text_processing'] ? rand(0, 3) : 0;
       $node_field['value'] = devel_create_content($format);
       $node_field['format'] = $format;
-    }
-    else {
+    } else {
       $allowed_values = content_allowed_values($field);
       if (!empty($allowed_values)) {
         // Just pick one of the specified allowed values.
         $node_field['value'] = array_rand($allowed_values);
-      }
-      else {
+      } else {
         // Generate a value that respects max_length.
         if (empty($field['max_length'])) {
           $field['max_length'] = 12;
@@ -129,8 +124,7 @@ 
   function number_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_number_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _number_content_generate($node, $field);
     }
   }
@@ -141,8 +135,7 @@ 
     if (!empty($allowed_values)) {
       // Just pick one of the specified allowed values.
       $node_field['value'] = array_rand($allowed_values);
-    }
-    else {
+    } else {
       $min = is_numeric($field['min']) ? $field['min'] : 0;
       switch ($field['type']) {
         case 'number_integer':
@@ -175,8 +168,7 @@ 
   function nodereference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_nodereference_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _nodereference_content_generate($node, $field);
     }
   }
@@ -197,8 +189,7 @@ 
   function userreference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_userreference_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _userreference_content_generate($node, $field);
     }
   }

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

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  *   the form_state for the above form
  * @param $field
  *   the field array to use to create the form element
- * @param $get_delta
+ * @param integer $get_delta
  *   use to get only a specific delta value of a multiple value field, otherwise
  *   function will return the entire $field form element.
  */

Indentation +191 added lines, -191 removed lines

@@ -9,12 +9,12 @@ 
  * chosen widget.
  */
 function content_form(&$form, &$form_state) {
-  $type = content_types($form['type']['#value']);
-  foreach ($type['fields'] as $field_name => $field) {
+    $type = content_types($form['type']['#value']);
+    foreach ($type['fields'] as $field_name => $field) {
     $form['#field_info'][$field['field_name']] = $field;
     $form += (array) content_field_form($form, $form_state, $field);
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
@@ -36,18 +36,18 @@ 
  *   function will return the entire $field form element.
  */
 function content_field_form(&$form, &$form_state, $field, $get_delta = NULL) {
-  $form['#cache'] = FALSE;
-  $node = $form['#node'];
-  $addition = array();
-  $form_element = array();
-  $field_name = $field['field_name'];
-
-  $items = array();
-
-  // TODO: is the "if (function_exists($function)) {" needed ?
-  // defining the $function here makes it unclear where it is actually called
-  $function = $field['widget']['module'] .'_widget';
-  if (function_exists($function)) {
+    $form['#cache'] = FALSE;
+    $node = $form['#node'];
+    $addition = array();
+    $form_element = array();
+    $field_name = $field['field_name'];
+
+    $items = array();
+
+    // TODO: is the "if (function_exists($function)) {" needed ?
+    // defining the $function here makes it unclear where it is actually called
+    $function = $field['widget']['module'] .'_widget';
+    if (function_exists($function)) {
     // Prepare the values to be filled in the widget.
     // We look in the following places:
     // - Form submitted values
@@ -55,88 +55,88 @@ 
     //   creating a new node translation)
     // - Default values set for the field (when creating a new node).
     if (!empty($form_state['values'][$field['field_name']])) {
-      $items = $form_state['values'][$field['field_name']];
-      // If there was an AHAH add more button in this field, don't save it.
-      unset($items[$field['field_name'] .'_add_more']);
+        $items = $form_state['values'][$field['field_name']];
+        // If there was an AHAH add more button in this field, don't save it.
+        unset($items[$field['field_name'] .'_add_more']);
     }
     elseif (!empty($node->$field['field_name'])) {
-      $items = $node->$field['field_name'];
+        $items = $node->$field['field_name'];
     }
     elseif (empty($node->nid)) {
-      if (content_callback('widget', 'default value', $field) != CONTENT_CALLBACK_NONE) {
+        if (content_callback('widget', 'default value', $field) != CONTENT_CALLBACK_NONE) {
         // If a module wants to insert custom default values here,
         // it should provide a hook_default_value() function to call,
         // otherwise the content module's content_default_value() function
         // will be used.
         $callback = content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_CUSTOM ? $field['widget']['module'] .'_default_value' : 'content_default_value';
         if (function_exists($callback)) {
-          $items = $callback($form, $form_state, $field, 0);
+            $items = $callback($form, $form_state, $field, 0);
+        }
         }
-      }
     }
 
     // See if access to this form element is restricted,
     // if so, skip widget processing and just set the value.
     $access = content_access('edit', $field, NULL, $node);
     if (!$access) {
-      $addition[$field_name] = array(
+        $addition[$field_name] = array(
         '#access' => $access,
         '#type' => 'value',
         '#value' => $items,
-      );
-      return $addition;
+        );
+        return $addition;
     }
 
     // If content module handles multiple values for this form element,
     // and not selecting an individual $delta, process the multiple value form.
     if (!isset($get_delta) && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-      $form_element = content_multiple_value_form($form, $form_state, $field, $items);
+        $form_element = content_multiple_value_form($form, $form_state, $field, $items);
     }
     // If the widget is handling multiple values (e.g optionwidgets),
     // or selecting an individual element, just get a single form
     // element and make it the $delta value.
     else {
-      $delta = isset($get_delta) ? $get_delta : 0;
-      if ($element = $function($form, $form_state, $field, $items, $delta)) {
+        $delta = isset($get_delta) ? $get_delta : 0;
+        if ($element = $function($form, $form_state, $field, $items, $delta)) {
         $title = check_plain(t($field['widget']['label']));
         $description = content_filter_xss(t($field['widget']['description']));
         $defaults = array(
-          '#required' => $get_delta > 0 ? FALSE : $field['required'],
-          '#columns'  => array_keys($field['columns']),
-          '#title' => $title,
-          '#description' => $description,
-          '#delta' => $delta,
-          '#field_name' => $field['field_name'],
-          '#type_name' => $field['type_name'],
+            '#required' => $get_delta > 0 ? FALSE : $field['required'],
+            '#columns'  => array_keys($field['columns']),
+            '#title' => $title,
+            '#description' => $description,
+            '#delta' => $delta,
+            '#field_name' => $field['field_name'],
+            '#type_name' => $field['type_name'],
         );
         // If we're processing a specific delta value for a field where the
         // content module handles multiples, set the delta in the result.
         // For fields that handle their own processing, we can't make assumptions
         // about how the field is structured, just merge in the returned value.
         if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-          $form_element[$delta] = array_merge($element, $defaults);
+            $form_element[$delta] = array_merge($element, $defaults);
         }
         else {
-          $form_element = array_merge($element, $defaults);
+            $form_element = array_merge($element, $defaults);
+        }
         }
-      }
     }
 
     // Field name is needed at top level as well as the individual elements
     // so the multiple values or other field level theme or processing can find it.
     if ($form_element) {
-      $defaults = array(
+        $defaults = array(
         '#field_name' => $field['field_name'],
         '#tree' => TRUE,
         '#weight' => $field['widget']['weight'],
         '#access' => $access,
         // TODO: what's the need for #count ? does not seem to be used anywhere ?
         '#count' => count($form_element),
-      );
-      $addition[$field['field_name']] = array_merge($form_element, $defaults);
+        );
+        $addition[$field['field_name']] = array_merge($form_element, $defaults);
+    }
     }
-  }
-  return $addition;
+    return $addition;
 }
 
 /**
@@ -148,42 +148,42 @@ 
  * - drag-n-drop value reordering
  */
 function content_multiple_value_form(&$form, &$form_state, $field, $items) {
-  $field_name = $field['field_name'];
+    $field_name = $field['field_name'];
 
-  switch ($field['multiple']) {
+    switch ($field['multiple']) {
     case 0:
       $max = 0;
-      break;
+        break;
     case 1:
       $filled_items = content_set_empty($field, $items);
-      $current_item_count = isset($form_state['item_count'][$field_name])
+        $current_item_count = isset($form_state['item_count'][$field_name])
                             ? $form_state['item_count'][$field_name]
                             : count($items);
-      // We always want at least one empty icon for the user to fill in.
-      $max = ($current_item_count > count($filled_items))
+        // We always want at least one empty icon for the user to fill in.
+        $max = ($current_item_count > count($filled_items))
               ? $current_item_count - 1
               : $current_item_count;
 
-      break;
+        break;
     default:
       $max = $field['multiple'] - 1;
-      break;
-  }
+        break;
+    }
 
-  $title = check_plain(t($field['widget']['label']));
-  $description = content_filter_xss(t($field['widget']['description']));
+    $title = check_plain(t($field['widget']['label']));
+    $description = content_filter_xss(t($field['widget']['description']));
 
-  $form_element = array(
+    $form_element = array(
     '#theme' => 'content_multiple_values',
     '#title' => $title,
     '#required' => $field['required'],
     '#description' => $description,
-  );
-  $function = $field['widget']['module'] .'_widget';
+    );
+    $function = $field['widget']['module'] .'_widget';
 
-  for ($delta = 0; $delta <= $max; $delta++) {
+    for ($delta = 0; $delta <= $max; $delta++) {
     if ($element = $function($form, $form_state, $field, $items, $delta)) {
-      $defaults = array(
+        $defaults = array(
         '#title' => ($field['multiple'] >= 1) ? '' : $title,
         '#description' => ($field['multiple'] >= 1) ? '' : $description,
         '#required' => $delta == 0 && $field['required'],
@@ -192,51 +192,51 @@ 
         '#columns' => array_keys($field['columns']),
         '#field_name' => $field_name,
         '#type_name' => $field['type_name'],
-      );
+        );
 
-      // Add an input field for the delta (drag-n-drop reordering), which will
-      // be hidden by tabledrag js behavior.
-      if ($field['multiple'] >= 1) {
+        // Add an input field for the delta (drag-n-drop reordering), which will
+        // be hidden by tabledrag js behavior.
+        if ($field['multiple'] >= 1) {
         // We name the element '_weight' to avoid clashing with column names
         // defined by field modules.
         $element['_weight'] = array(
-          '#type' => 'weight',
-          '#delta' => $max, // this 'delta' is the 'weight' element's property
-          '#default_value' => isset($items[$delta]['_weight']) ? $items[$delta]['_weight'] : $delta,
-          '#weight' => 100,
+            '#type' => 'weight',
+            '#delta' => $max, // this 'delta' is the 'weight' element's property
+            '#default_value' => isset($items[$delta]['_weight']) ? $items[$delta]['_weight'] : $delta,
+            '#weight' => 100,
         );
-      }
+        }
 
-      $form_element[$delta] = array_merge($element, $defaults);
+        $form_element[$delta] = array_merge($element, $defaults);
+    }
     }
-  }
 
-  // Add AHAH add more button, if not working with a programmed form.
-  if ($field['multiple'] == 1 && empty($form['#programmed'])) {
+    // Add AHAH add more button, if not working with a programmed form.
+    if ($field['multiple'] == 1 && empty($form['#programmed'])) {
     // Make sure the form is cached so ahah can work.
     $form['#cache'] = TRUE;
     $content_type = content_types($field['type_name']);
     $field_name_css = str_replace('_', '-', $field_name);
 
     $form_element[$field_name .'_add_more'] = array(
-      '#type' => 'submit',
-      '#name' => $field_name .'_add_more',
-      '#value' => t('Add another item'),
-      '#weight' => $field['widget']['weight'] + $max + 1,
-      // Submit callback for disabled JavaScript. drupal_get_form() might get
-      // the form from the cache, so we can't rely on content_form_alter()
-      // including this file. Therefore, call a proxy function to do this.
-      '#submit' => array('content_add_more_submit_proxy'),
-      '#ahah' => array(
+        '#type' => 'submit',
+        '#name' => $field_name .'_add_more',
+        '#value' => t('Add another item'),
+        '#weight' => $field['widget']['weight'] + $max + 1,
+        // Submit callback for disabled JavaScript. drupal_get_form() might get
+        // the form from the cache, so we can't rely on content_form_alter()
+        // including this file. Therefore, call a proxy function to do this.
+        '#submit' => array('content_add_more_submit_proxy'),
+        '#ahah' => array(
         'path' => 'content/js_add_more/'. $content_type['url_str'] .'/'. $field_name,
         'wrapper' => $field_name_css .'-items',
         'method' => 'replace',
         'effect' => 'fade',
-      ),
-      // When JS is disabled, the content_add_more_submit handler will find
-      // the relevant field using these entries.
-      '#field_name' => $field_name,
-      '#type_name' => $field['type_name'],
+        ),
+        // When JS is disabled, the content_add_more_submit handler will find
+        // the relevant field using these entries.
+        '#field_name' => $field_name,
+        '#type_name' => $field['type_name'],
     );
 
     // Add wrappers for the fields and 'more' button.
@@ -244,8 +244,8 @@ 
     $form_element['#suffix'] = '</div>';
     $form_element[$field_name .'_add_more']['#prefix'] = '<div class="content-add-more clear-block">';
     $form_element[$field_name .'_add_more']['#suffix'] = '</div>';
-  }
-  return $form_element;
+    }
+    return $form_element;
 }
 
 /**
@@ -254,127 +254,127 @@ 
  * entire form is rebuilt during the page reload.
  */
 function content_add_more_submit($form, &$form_state) {
-  // Set the form to rebuild and run submit handlers.
-  node_form_submit_build_node($form, $form_state);
-  $field_name = $form_state['clicked_button']['#field_name'];
-  $type_name = $form_state['clicked_button']['#type_name'];
+    // Set the form to rebuild and run submit handlers.
+    node_form_submit_build_node($form, $form_state);
+    $field_name = $form_state['clicked_button']['#field_name'];
+    $type_name = $form_state['clicked_button']['#type_name'];
 
-  // Make the changes we want to the form state.
-  if ($form_state['values'][$field_name][$field_name .'_add_more']) {
+    // Make the changes we want to the form state.
+    if ($form_state['values'][$field_name][$field_name .'_add_more']) {
     $form_state['item_count'][$field_name] = count($form_state['values'][$field_name]);
-  }
+    }
 }
 
 /**
  * Menu callback for AHAH addition of new empty widgets.
  */
 function content_add_more_js($type_name_url, $field_name) {
-  $type = content_types($type_name_url);
-  $field = content_fields($field_name, $type['type']);
+    $type = content_types($type_name_url);
+    $field = content_fields($field_name, $type['type']);
 
-  if (($field['multiple'] != 1) || empty($_POST['form_build_id'])) {
+    if (($field['multiple'] != 1) || empty($_POST['form_build_id'])) {
     // Invalid request.
     drupal_json(array('data' => ''));
     exit;
-  }
+    }
 
-  // Retrieve the cached form.
-  $form_state = array('submitted' => FALSE);
-  $form_build_id = $_POST['form_build_id'];
-  $form = form_get_cache($form_build_id, $form_state);
-  if (!$form) {
+    // Retrieve the cached form.
+    $form_state = array('submitted' => FALSE);
+    $form_build_id = $_POST['form_build_id'];
+    $form = form_get_cache($form_build_id, $form_state);
+    if (!$form) {
     // Invalid form_build_id.
     drupal_json(array('data' => ''));
     exit;
-  }
-
-  // We don't simply return a new empty widget to append to existing ones, because
-  // - ahah.js won't simply let us add a new row to a table
-  // - attaching the 'draggable' behavior won't be easy
-  // So we resort to rebuilding the whole table of widgets including the existing ones,
-  // which makes us jump through a few hoops.
-
-  // The form that we get from the cache is unbuilt. We need to build it so that
-  // _value callbacks can be executed and $form_state['values'] populated.
-  // We only want to affect $form_state['values'], not the $form itself
-  // (built forms aren't supposed to enter the cache) nor the rest of $form_data,
-  // so we use copies of $form and $form_data.
-  $form_copy = $form;
-  $form_state_copy = $form_state;
-  $form_copy['#post'] = array();
-  form_builder($_POST['form_id'], $form_copy, $form_state_copy);
-  // Just grab the data we need.
-  $form_state['values'] = $form_state_copy['values'];
-  // Reset cached ids, so that they don't affect the actual form we output.
-  form_clean_id(NULL, TRUE);
-
-  // Sort the $form_state['values'] we just built *and* the incoming $_POST data
-  // according to d-n-d reordering.
-  unset($form_state['values'][$field_name][$field['field_name'] .'_add_more']);
-  foreach ($_POST[$field_name] as $delta => $item) {
+    }
+
+    // We don't simply return a new empty widget to append to existing ones, because
+    // - ahah.js won't simply let us add a new row to a table
+    // - attaching the 'draggable' behavior won't be easy
+    // So we resort to rebuilding the whole table of widgets including the existing ones,
+    // which makes us jump through a few hoops.
+
+    // The form that we get from the cache is unbuilt. We need to build it so that
+    // _value callbacks can be executed and $form_state['values'] populated.
+    // We only want to affect $form_state['values'], not the $form itself
+    // (built forms aren't supposed to enter the cache) nor the rest of $form_data,
+    // so we use copies of $form and $form_data.
+    $form_copy = $form;
+    $form_state_copy = $form_state;
+    $form_copy['#post'] = array();
+    form_builder($_POST['form_id'], $form_copy, $form_state_copy);
+    // Just grab the data we need.
+    $form_state['values'] = $form_state_copy['values'];
+    // Reset cached ids, so that they don't affect the actual form we output.
+    form_clean_id(NULL, TRUE);
+
+    // Sort the $form_state['values'] we just built *and* the incoming $_POST data
+    // according to d-n-d reordering.
+    unset($form_state['values'][$field_name][$field['field_name'] .'_add_more']);
+    foreach ($_POST[$field_name] as $delta => $item) {
     $form_state['values'][$field_name][$delta]['_weight'] = $item['_weight'];
-  }
-  $form_state['values'][$field_name] = _content_sort_items($field, $form_state['values'][$field_name]);
-  $_POST[$field_name] = _content_sort_items($field, $_POST[$field_name]);
-
-  // Build our new form element for the whole field, asking for one more element.
-  $form_state['item_count'] = array($field_name => count($_POST[$field_name]) + 1);
-  $form_element = content_field_form($form, $form_state, $field);
-  // Let other modules alter it.
-  // We pass an empty array as hook_form_alter's usual 'form_state' parameter,
-  // instead of $form_state (for reasons we may never remember).
-  // However, this argument is still expected to be passed by-reference
-  // (and PHP5.3 will throw an error if it isn't.) This leads to:
-  $data = &$form_element;
-  $empty_form_state = array();
-  $data['__drupal_alter_by_ref'] = array(&$empty_form_state);
-  drupal_alter('form', $data, 'content_add_more_js');
-
-  // Add the new element at the right place in the (original, unbuilt) form.
-  if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type['type'], $field_name))) {
+    }
+    $form_state['values'][$field_name] = _content_sort_items($field, $form_state['values'][$field_name]);
+    $_POST[$field_name] = _content_sort_items($field, $_POST[$field_name]);
+
+    // Build our new form element for the whole field, asking for one more element.
+    $form_state['item_count'] = array($field_name => count($_POST[$field_name]) + 1);
+    $form_element = content_field_form($form, $form_state, $field);
+    // Let other modules alter it.
+    // We pass an empty array as hook_form_alter's usual 'form_state' parameter,
+    // instead of $form_state (for reasons we may never remember).
+    // However, this argument is still expected to be passed by-reference
+    // (and PHP5.3 will throw an error if it isn't.) This leads to:
+    $data = &$form_element;
+    $empty_form_state = array();
+    $data['__drupal_alter_by_ref'] = array(&$empty_form_state);
+    drupal_alter('form', $data, 'content_add_more_js');
+
+    // Add the new element at the right place in the (original, unbuilt) form.
+    if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type['type'], $field_name))) {
     $form[$group_name][$field_name] = $form_element[$field_name];
-  }
-  else {
+    }
+    else {
     $form[$field_name] = $form_element[$field_name];
-  }
-
-  // Save the new definition of the form.
-  $form_state['values'] = array();
-  form_set_cache($form_build_id, $form, $form_state);
-
-  // Build the new form against the incoming $_POST values so that we can
-  // render the new element.
-  $delta = max(array_keys($_POST[$field_name])) + 1;
-  $_POST[$field_name][$delta]['_weight'] = $delta;
-  $form_state = array('submitted' => FALSE);
-  $form += array(
+    }
+
+    // Save the new definition of the form.
+    $form_state['values'] = array();
+    form_set_cache($form_build_id, $form, $form_state);
+
+    // Build the new form against the incoming $_POST values so that we can
+    // render the new element.
+    $delta = max(array_keys($_POST[$field_name])) + 1;
+    $_POST[$field_name][$delta]['_weight'] = $delta;
+    $form_state = array('submitted' => FALSE);
+    $form += array(
     '#post' => $_POST,
     '#programmed' => FALSE,
-  );
-  $form = form_builder($_POST['form_id'], $form, $form_state);
-
-  // Render the new output.
-  $field_form = (!empty($group_name)) ? $form[$group_name][$field_name] : $form[$field_name];
-  // We add a div around the new content to receive the ahah effect.
-  $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'. (isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
-  $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '') .'</div>';
-  // Prevent duplicate wrapper.
-  unset($field_form['#prefix'], $field_form['#suffix']);
-
-  // If a newly inserted widget contains AHAH behaviors, they normally won't
-  // work because AHAH doesn't know about those - it just attaches to the exact
-  // form elements that were initially specified in the Drupal.settings object.
-  // The new ones didn't exist then, so we need to update Drupal.settings
-  // by ourselves in order to let AHAH know about those new form elements.
-  $javascript = drupal_add_js(NULL, NULL);
-  $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>' : '';
-
-  $output = theme('status_messages') . drupal_render($field_form) . $output_js;
-
-  // Using drupal_json() breaks filefield's file upload, because the jQuery
-  // Form plugin handles file uploads in a way that is not compatible with
-  // 'text/javascript' response type.
-  $GLOBALS['devel_shutdown'] =  FALSE;
-  print drupal_to_js(array('status' => TRUE, 'data' => $output));
-  exit;
+    );
+    $form = form_builder($_POST['form_id'], $form, $form_state);
+
+    // Render the new output.
+    $field_form = (!empty($group_name)) ? $form[$group_name][$field_name] : $form[$field_name];
+    // We add a div around the new content to receive the ahah effect.
+    $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'. (isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
+    $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '') .'</div>';
+    // Prevent duplicate wrapper.
+    unset($field_form['#prefix'], $field_form['#suffix']);
+
+    // If a newly inserted widget contains AHAH behaviors, they normally won't
+    // work because AHAH doesn't know about those - it just attaches to the exact
+    // form elements that were initially specified in the Drupal.settings object.
+    // The new ones didn't exist then, so we need to update Drupal.settings
+    // by ourselves in order to let AHAH know about those new form elements.
+    $javascript = drupal_add_js(NULL, NULL);
+    $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>' : '';
+
+    $output = theme('status_messages') . drupal_render($field_form) . $output_js;
+
+    // Using drupal_json() breaks filefield's file upload, because the jQuery
+    // Form plugin handles file uploads in a way that is not compatible with
+    // 'text/javascript' response type.
+    $GLOBALS['devel_shutdown'] =  FALSE;
+    print drupal_to_js(array('status' => TRUE, 'data' => $output));
+    exit;
 }

Switch Indentation +17 added lines, -17 removed lines

@@ -151,23 +151,23 @@
   $field_name = $field['field_name'];
 
   switch ($field['multiple']) {
-    case 0:
-      $max = 0;
-      break;
-    case 1:
-      $filled_items = content_set_empty($field, $items);
-      $current_item_count = isset($form_state['item_count'][$field_name])
-                            ? $form_state['item_count'][$field_name]
-                            : count($items);
-      // We always want at least one empty icon for the user to fill in.
-      $max = ($current_item_count > count($filled_items))
-              ? $current_item_count - 1
-              : $current_item_count;
-
-      break;
-    default:
-      $max = $field['multiple'] - 1;
-      break;
+  case 0:
+    $max = 0;
+    break;
+  case 1:
+    $filled_items = content_set_empty($field, $items);
+    $current_item_count = isset($form_state['item_count'][$field_name])
+                          ? $form_state['item_count'][$field_name]
+                          : count($items);
+    // We always want at least one empty icon for the user to fill in.
+    $max = ($current_item_count > count($filled_items))
+            ? $current_item_count - 1
+            : $current_item_count;
+
+    break;
+  default:
+    $max = $field['multiple'] - 1;
+    break;
   }
 
   $title = check_plain(t($field['widget']['label']));

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,7 @@ 
   $type = content_types($form['type']['#value']);
   foreach ($type['fields'] as $field_name => $field) {
     $form['#field_info'][$field['field_name']] = $field;
-    $form += (array) content_field_form($form, $form_state, $field);
+    $form += (array)content_field_form($form, $form_state, $field);
   }
   return $form;
 }
@@ -46,7 +46,7 @@ 
 
   // TODO: is the "if (function_exists($function)) {" needed ?
   // defining the $function here makes it unclear where it is actually called
-  $function = $field['widget']['module'] .'_widget';
+  $function = $field['widget']['module'].'_widget';
   if (function_exists($function)) {
     // Prepare the values to be filled in the widget.
     // We look in the following places:
@@ -57,7 +57,7 @@ 
     if (!empty($form_state['values'][$field['field_name']])) {
       $items = $form_state['values'][$field['field_name']];
       // If there was an AHAH add more button in this field, don't save it.
-      unset($items[$field['field_name'] .'_add_more']);
+      unset($items[$field['field_name'].'_add_more']);
     }
     elseif (!empty($node->$field['field_name'])) {
       $items = $node->$field['field_name'];
@@ -68,7 +68,7 @@ 
         // it should provide a hook_default_value() function to call,
         // otherwise the content module's content_default_value() function
         // will be used.
-        $callback = content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_CUSTOM ? $field['widget']['module'] .'_default_value' : 'content_default_value';
+        $callback = content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_CUSTOM ? $field['widget']['module'].'_default_value' : 'content_default_value';
         if (function_exists($callback)) {
           $items = $callback($form, $form_state, $field, 0);
         }
@@ -179,7 +179,7 @@ 
     '#required' => $field['required'],
     '#description' => $description,
   );
-  $function = $field['widget']['module'] .'_widget';
+  $function = $field['widget']['module'].'_widget';
 
   for ($delta = 0; $delta <= $max; $delta++) {
     if ($element = $function($form, $form_state, $field, $items, $delta)) {
@@ -218,9 +218,9 @@ 
     $content_type = content_types($field['type_name']);
     $field_name_css = str_replace('_', '-', $field_name);
 
-    $form_element[$field_name .'_add_more'] = array(
+    $form_element[$field_name.'_add_more'] = array(
       '#type' => 'submit',
-      '#name' => $field_name .'_add_more',
+      '#name' => $field_name.'_add_more',
       '#value' => t('Add another item'),
       '#weight' => $field['widget']['weight'] + $max + 1,
       // Submit callback for disabled JavaScript. drupal_get_form() might get
@@ -228,8 +228,8 @@ 
       // including this file. Therefore, call a proxy function to do this.
       '#submit' => array('content_add_more_submit_proxy'),
       '#ahah' => array(
-        'path' => 'content/js_add_more/'. $content_type['url_str'] .'/'. $field_name,
-        'wrapper' => $field_name_css .'-items',
+        'path' => 'content/js_add_more/'.$content_type['url_str'].'/'.$field_name,
+        'wrapper' => $field_name_css.'-items',
         'method' => 'replace',
         'effect' => 'fade',
       ),
@@ -240,10 +240,10 @@ 
     );
 
     // Add wrappers for the fields and 'more' button.
-    $form_element['#prefix'] = '<div id="'. $field_name_css .'-items">';
+    $form_element['#prefix'] = '<div id="'.$field_name_css.'-items">';
     $form_element['#suffix'] = '</div>';
-    $form_element[$field_name .'_add_more']['#prefix'] = '<div class="content-add-more clear-block">';
-    $form_element[$field_name .'_add_more']['#suffix'] = '</div>';
+    $form_element[$field_name.'_add_more']['#prefix'] = '<div class="content-add-more clear-block">';
+    $form_element[$field_name.'_add_more']['#suffix'] = '</div>';
   }
   return $form_element;
 }
@@ -260,7 +260,7 @@ 
   $type_name = $form_state['clicked_button']['#type_name'];
 
   // Make the changes we want to the form state.
-  if ($form_state['values'][$field_name][$field_name .'_add_more']) {
+  if ($form_state['values'][$field_name][$field_name.'_add_more']) {
     $form_state['item_count'][$field_name] = count($form_state['values'][$field_name]);
   }
 }
@@ -310,7 +310,7 @@ 
 
   // Sort the $form_state['values'] we just built *and* the incoming $_POST data
   // according to d-n-d reordering.
-  unset($form_state['values'][$field_name][$field['field_name'] .'_add_more']);
+  unset($form_state['values'][$field_name][$field['field_name'].'_add_more']);
   foreach ($_POST[$field_name] as $delta => $item) {
     $form_state['values'][$field_name][$delta]['_weight'] = $item['_weight'];
   }
@@ -356,8 +356,8 @@ 
   // Render the new output.
   $field_form = (!empty($group_name)) ? $form[$group_name][$field_name] : $form[$field_name];
   // We add a div around the new content to receive the ahah effect.
-  $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'. (isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
-  $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '') .'</div>';
+  $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'.(isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
+  $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '').'</div>';
   // Prevent duplicate wrapper.
   unset($field_form['#prefix'], $field_form['#suffix']);
 
@@ -367,14 +367,14 @@ 
   // The new ones didn't exist then, so we need to update Drupal.settings
   // by ourselves in order to let AHAH know about those new form elements.
   $javascript = drupal_add_js(NULL, NULL);
-  $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>' : '';
+  $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '.drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])).');</script>' : '';
 
-  $output = theme('status_messages') . drupal_render($field_form) . $output_js;
+  $output = theme('status_messages').drupal_render($field_form).$output_js;
 
   // Using drupal_json() breaks filefield's file upload, because the jQuery
   // Form plugin handles file uploads in a way that is not compatible with
   // 'text/javascript' response type.
-  $GLOBALS['devel_shutdown'] =  FALSE;
+  $GLOBALS['devel_shutdown'] = FALSE;
   print drupal_to_js(array('status' => TRUE, 'data' => $output));
   exit;
 }

Braces +4 added lines, -8 removed lines

@@ -58,11 +58,9 @@ 
       $items = $form_state['values'][$field['field_name']];
       // If there was an AHAH add more button in this field, don't save it.
       unset($items[$field['field_name'] .'_add_more']);
-    }
-    elseif (!empty($node->$field['field_name'])) {
+    } elseif (!empty($node->$field['field_name'])) {
       $items = $node->$field['field_name'];
-    }
-    elseif (empty($node->nid)) {
+    } elseif (empty($node->nid)) {
       if (content_callback('widget', 'default value', $field) != CONTENT_CALLBACK_NONE) {
         // If a module wants to insert custom default values here,
         // it should provide a hook_default_value() function to call,
@@ -115,8 +113,7 @@ 
         // about how the field is structured, just merge in the returned value.
         if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
           $form_element[$delta] = array_merge($element, $defaults);
-        }
-        else {
+        } else {
           $form_element = array_merge($element, $defaults);
         }
       }
@@ -333,8 +330,7 @@ 
   // Add the new element at the right place in the (original, unbuilt) form.
   if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type['type'], $field_name))) {
     $form[$group_name][$field_name] = $form_element[$field_name];
-  }
-  else {
+  } else {
     $form[$field_name] = $form_element[$field_name];
   }
 

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

Doc Comments +1 added lines

@@ -289,6 +289,7 @@
 /**
  * Returns the fields of a given field type only.
  * Suitable for using it with #options.
+ * @param string $type
  */
 function content_rules_get_field_names_by_type($type = NULL) {
   $fields = array();

Indentation +124 added lines, -124 removed lines

@@ -10,34 +10,34 @@ 
  * Implementation of hook_rules_action_info().
  */
 function content_rules_action_info() {
-  $info = array();
-  $info['content_rules_action_populate_field'] = array(
+    $info = array();
+    $info['content_rules_action_populate_field'] = array(
     'label' => t('Populate a field'),
     'arguments' => array(
-      'node' => array(
+        'node' => array(
         'type' => 'node',
         'label' => t('Content'),
-      ),
+        ),
     ),
     'eval input' => array('code'),
     'help' => t('You should make sure that the used field exists in the given content type.'),
     'module' => 'CCK',
-  );
-  return $info;
+    );
+    return $info;
 }
 
 /**
  * Action: populate a field.
  */
 function content_rules_action_populate_field($node, $settings, $element, &$state) {
-  // Get information about the field.
-  $field = content_fields($settings['field_name'], $node->type);
-  $value = _content_rules_get_field_value($settings, $state);
+    // Get information about the field.
+    $field = content_fields($settings['field_name'], $node->type);
+    $value = _content_rules_get_field_value($settings, $state);
 
-  if (!empty($field) && is_array($value)) {
+    if (!empty($field) && is_array($value)) {
     $node->$settings['field_name'] = $value;
     return array('node' => $node);
-  }
+    }
 }
 
 
@@ -46,15 +46,15 @@ 
  * This is a multistep form!
  */
 function content_rules_action_populate_field_form($settings, &$form, &$form_state) {
-  $settings += array('field_name' => '', 'code' => '', 'value' => NULL);
-  if (empty($settings['field_name'])) {
+    $settings += array('field_name' => '', 'code' => '', 'value' => NULL);
+    if (empty($settings['field_name'])) {
     $form['settings']['field_name'] = array(
-      '#type' => 'select',
-      '#title' => t('Field'),
-      '#options' => content_rules_get_field_names_by_type(),
-      '#default_value' => $settings['field_name'],
-      '#description' => t('Select the machine-name of the field.'),
-      '#required' => TRUE,
+        '#type' => 'select',
+        '#title' => t('Field'),
+        '#options' => content_rules_get_field_names_by_type(),
+        '#default_value' => $settings['field_name'],
+        '#description' => t('Select the machine-name of the field.'),
+        '#required' => TRUE,
     );
     // Hide some form elements in the first step.
     $form['negate']['#access'] = FALSE;
@@ -64,8 +64,8 @@ 
     // Replace the usual submit handlers with a own handler.
     $form['submit']['#submit'] = array('content_rules_action_populate_field_form_step_submit');
     $form['submit']['#value'] = t('Continue');
-  }
-  else {
+    }
+    else {
     // Show the fields form here.
     module_load_include('inc', 'content', 'includes/content.node_form');
     $field = content_fields($settings['field_name']);
@@ -78,111 +78,111 @@ 
 
     unset($form['#cache']);
 
-      // Advanced: PHP code.
+        // Advanced: PHP code.
     $form['advanced_options'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Advanced: Specify the fields value with PHP code'),
-      '#collapsible' => TRUE,
-      '#collapsed' => empty($settings['code']),
-      '#weight' => 5,
+        '#type' => 'fieldset',
+        '#title' => t('Advanced: Specify the fields value with PHP code'),
+        '#collapsible' => TRUE,
+        '#collapsed' => empty($settings['code']),
+        '#weight' => 5,
     );
 
     $db_info = content_database_info($field);
     $columns = array_keys($db_info['columns']);
     foreach ($columns as $key => $column) {
-      $columns[$key] = t("'@column' => value for @column", array('@column' => $column));
+        $columns[$key] = t("'@column' => value for @column", array('@column' => $column));
     }
     $sample = t("return array(\n  0 => array(@columns),\n  // You'll usually want to stop here. Provide more values\n  // if you want your 'default value' to be multi-valued:\n  1 => array(@columns),\n  2 => ...\n);", array('@columns' => implode(', ', $columns)));
 
     $form['advanced_options']['code'] = array(
-      '#type' => 'textarea',
-      '#title' => t('Code'),
-      '#default_value' => $settings['code'],
-      '#rows' => 6,
-      '#description' => t('Advanced usage only: PHP code that returns the value to set. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using <a href="@link_devel">devel.module\'s</a> \'devel load\' tab on a content page might help you figure out the expected format.', array(
+        '#type' => 'textarea',
+        '#title' => t('Code'),
+        '#default_value' => $settings['code'],
+        '#rows' => 6,
+        '#description' => t('Advanced usage only: PHP code that returns the value to set. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using <a href="@link_devel">devel.module\'s</a> \'devel load\' tab on a content page might help you figure out the expected format.', array(
         '!sample' => $sample,
         '@link_devel' => 'http://www.drupal.org/project/devel',
-      )),
+        )),
     );
 
     // Add this file to be included when the form is built by rules
     // as it's needed by CCKs add more button.
     // See rules_after_build_include_files().
     $form['#includes'][] = './'. drupal_get_path('module', 'node') .'/node.pages.inc';
-  }
+    }
 }
 
 function content_rules_action_populate_field_form_step_submit($form, &$form_state) {
-  $form_state['element']['#settings']['field_name'] = $form_state['values']['settings']['field_name'];
+    $form_state['element']['#settings']['field_name'] = $form_state['values']['settings']['field_name'];
 }
 
 /**
  * Validate the chosen value or php code.
  */
 function content_rules_action_populate_field_validate($form, &$form_state) {
-  if (!isset($form_state['element']['#settings']['field_name'])) {
+    if (!isset($form_state['element']['#settings']['field_name'])) {
     //Just validate the last step.
     return;
-  }
+    }
 
-  if (isset($form_state['values']['code']) && ($php = $form_state['values']['code'])) {
+    if (isset($form_state['values']['code']) && ($php = $form_state['values']['code'])) {
     if (strpos($php, 'return') === FALSE) {
-      form_set_error('code', t('You have to return the default value in the expected format.'));
+        form_set_error('code', t('You have to return the default value in the expected format.'));
     }
-  }
-  else {
+    }
+    else {
     // Validate the field.
     $settings = $form_state['element']['#settings'];
     $field = content_fields($settings['field_name']);
     $field_types = _content_field_types();
     $function = $field_types[$field['type']]['module'] .'_field';
     if (function_exists($function)) {
-      $form['#node'] = (object)array('type' => '', $settings['field_name'] => $form_state['values'][$settings['field_name']]);
-      $items = isset($form['#node']->$field['field_name']) ? $form['#node']->$field['field_name'] : array();
+        $form['#node'] = (object)array('type' => '', $settings['field_name'] => $form_state['values'][$settings['field_name']]);
+        $items = isset($form['#node']->$field['field_name']) ? $form['#node']->$field['field_name'] : array();
 
-      //Make sure AHAH 'add more' button isn't sent to the fields
-      // for processing.
-      unset($items[$field['field_name'] .'_add_more']);
+        //Make sure AHAH 'add more' button isn't sent to the fields
+        // for processing.
+        unset($items[$field['field_name'] .'_add_more']);
 
-      $function('validate', $form['#node'], $field, $items, $form, NULL);
-      content_field('validate', $form['#node'], $field, $items, $form, NULL);
+        $function('validate', $form['#node'], $field, $items, $form, NULL);
+        content_field('validate', $form['#node'], $field, $items, $form, NULL);
+    }
     }
-  }
 }
 
 function content_rules_action_populate_field_submit(&$settings, $form, &$form_state) {
-  // Take over field values and filter out private properties added by CCK
-  $settings['value'] = array_filter($form_state['values'][$settings['field_name']], 'is_array');
+    // Take over field values and filter out private properties added by CCK
+    $settings['value'] = array_filter($form_state['values'][$settings['field_name']], 'is_array');
 
-  foreach ($settings['value'] as $key => $data) {
+    foreach ($settings['value'] as $key => $data) {
     foreach (array_filter(array_keys($data)) as $col) {
-      if ($col[0] == '_') {
+        if ($col[0] == '_') {
         unset($settings['value'][$key][$col]);
-      }
+        }
     }
     if ($key && count(array_filter($settings['value'][$key])) == 0) {
-      // For multi-valued fields don't check for any additional empty values.
-      unset($settings['value'][$key]);
+        // For multi-valued fields don't check for any additional empty values.
+        unset($settings['value'][$key]);
+    }
     }
-  }
 
-  $settings['code'] = $form_state['values']['code'];
+    $settings['code'] = $form_state['values']['code'];
 
-  if (function_exists('rules_action_custom_php_submit')) {
+    if (function_exists('rules_action_custom_php_submit')) {
     // Support adding variables to the php code, if php module is present.
     rules_action_custom_php_submit($settings, $form, $form_state);
-  }
+    }
 
-  // Add all values to the input evaluator, so that textfields / textares can
-  // make use of it.
-  $names = array('code');
+    // Add all values to the input evaluator, so that textfields / textares can
+    // make use of it.
+    $names = array('code');
 
-  foreach ($settings['value'] as $key => $data) {
+    foreach ($settings['value'] as $key => $data) {
     foreach (array_filter($data, 'is_string') as $col => $value) {
-      $names[] = "value|$key|$col";
+        $names[] = "value|$key|$col";
+    }
     }
-  }
-  $form_state['element']['#info']['eval input'] = $names;
+    $form_state['element']['#info']['eval input'] = $names;
 }
 
 
@@ -190,14 +190,14 @@ 
  * Label callback: Improve the label of the action.
  */
 function content_rules_action_populate_field_label($settings, $argument_labels) {
-  return t("Populate @node's field '@field'", array('@field' => $settings['field_name']) + $argument_labels);
+    return t("Populate @node's field '@field'", array('@field' => $settings['field_name']) + $argument_labels);
 }
 
 function workflow_ng_action_populate_field_upgrade(&$element) {
-  $element['#name'] = 'content_rules_action_populate_field';
-  $element['#settings']['code'] = $element['#settings']['default_value_php'];
-  $element['#settings'][$element['#settings']['field_name']] = array();
-  unset($element['#settings']['default_value_php']);
+    $element['#name'] = 'content_rules_action_populate_field';
+    $element['#settings']['code'] = $element['#settings']['default_value_php'];
+    $element['#settings'][$element['#settings']['field_name']] = array();
+    unset($element['#settings']['default_value_php']);
 }
 
 
@@ -205,84 +205,84 @@ 
  * Implementation of hook_rules_condition_info().
  */
 function content_rules_condition_info() {
-  $info = array();
-  $info['content_rules_field_has_value'] = array(
+    $info = array();
+    $info['content_rules_field_has_value'] = array(
     'label' => t('Field has value'),
     'arguments' => array(
-      'node' => array('type' => 'node', 'label' => t('Content')),
+        'node' => array('type' => 'node', 'label' => t('Content')),
     ),
     'eval input' => array('code'),
     'help' => t('You should make sure that the used field exists in the given content type. The condition returns TRUE, if the selected field has the given value.'),
     'module' => 'CCK',
-  );
-  $info['content_rules_field_changed'] = array(
+    );
+    $info['content_rules_field_changed'] = array(
     'label' => t('Field has changed'),
     'arguments' => array(
-      'node' => array('type' => 'node', 'label' => t('Content containing changes')),
-      'node_unchanged' => array('type' => 'node', 'label' => t('Content not containing changes')),
+        'node' => array('type' => 'node', 'label' => t('Content containing changes')),
+        'node_unchanged' => array('type' => 'node', 'label' => t('Content not containing changes')),
     ),
     'help' => t('You should make sure that the used field exists in the given content type.'),
     'module' => 'CCK',
-  );
-  return $info;
+    );
+    return $info;
 }
 
 /**
  * Condition: Check the value of a field.
  */
 function content_rules_field_has_value($node, $settings) {
-  // Get information about the field.
-  $field = content_fields($settings['field_name'], $node->type);
-  $value = _content_rules_get_field_value($settings, $state);
+    // Get information about the field.
+    $field = content_fields($settings['field_name'], $node->type);
+    $value = _content_rules_get_field_value($settings, $state);
 
-  if (empty($field) || !is_array($value)) {
+    if (empty($field) || !is_array($value)) {
     return FALSE;
-  }
+    }
 
-  return _content_rules_field_has_value($node->$settings['field_name'], $value);
+    return _content_rules_field_has_value($node->$settings['field_name'], $value);
 }
 
 /**
  * Use the same configuration form as the "populate field" action.
  */
 function content_rules_field_has_value_form($settings, &$form, &$form_state) {
-  content_rules_action_populate_field_form($settings, $form, $form_state);
+    content_rules_action_populate_field_form($settings, $form, $form_state);
 }
 function content_rules_field_has_value_validate($form, &$form_state) {
-  content_rules_action_populate_field_validate($form, $form_state);
+    content_rules_action_populate_field_validate($form, $form_state);
 }
 function content_rules_field_has_value_submit(&$settings, $form, &$form_state) {
-  content_rules_action_populate_field_submit($settings, $form, $form_state);
+    content_rules_action_populate_field_submit($settings, $form, $form_state);
 }
 
 function content_rules_field_has_value_label($settings, $argument_labels) {
-  return t("@node's field '@field' has value", array('@field' => $settings['field_name']) + $argument_labels);
+    return t("@node's field '@field' has value", array('@field' => $settings['field_name']) + $argument_labels);
 }
 
 /**
  * Condition: Check if the field has changed.
  */
 function content_rules_field_changed($node1, $node2, $settings) {
-  // Get information about the field.
-  $field = content_fields($settings['field_name'], $node1->type);
+    // Get information about the field.
+    $field = content_fields($settings['field_name'], $node1->type);
 
-  return !empty($field) && !_content_rules_field_has_value($node1->$settings['field_name'], $node2->$settings['field_name']);
+    return !empty($field) && !_content_rules_field_has_value($node1->$settings['field_name'], $node2->$settings['field_name']);
 }
 
 function content_rules_field_changed_form($settings, &$form, &$form_state) {
-  $settings += array('field_name' => '');
-  $form['settings']['field_name'] = array(
+    $settings += array('field_name' => '');
+    $form['settings']['field_name'] = array(
     '#type' => 'select',
     '#title' => t('Field'),
     '#options' => content_rules_get_field_names_by_type(),
     '#default_value' => $settings['field_name'],
     '#description' => t('Select the machine-name of the field to look at.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_rules_field_changed_label($settings, $argument_labels) {
-  return t("@node's field '@field' has been changed", array('@field' => $settings['field_name']) + $argument_labels);
+    return t("@node's field '@field' has been changed", array('@field' => $settings['field_name']) + $argument_labels);
 }
 
 
@@ -291,32 +291,32 @@ 
  * Suitable for using it with #options.
  */
 function content_rules_get_field_names_by_type($type = NULL) {
-  $fields = array();
-  foreach (content_fields() as $field) {
+    $fields = array();
+    foreach (content_fields() as $field) {
     if (!isset($type) || $field['type'] == $type) {
-      $fields[$field['field_name']] = $field['field_name'];
+        $fields[$field['field_name']] = $field['field_name'];
+    }
     }
-  }
-  asort($fields);
-  return $fields;
+    asort($fields);
+    return $fields;
 }
 
 function _content_rules_get_field_value($settings, &$state) {
-  if ($settings['code']) {
+    if ($settings['code']) {
     if (function_exists('rules_input_evaluator_php_apply')) {
-      // Support adding variables to the php code, if php module is present.
-      $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, FALSE);
+        // Support adding variables to the php code, if php module is present.
+        $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, FALSE);
     }
     else {
-      ob_start();
-      $value = eval($settings['code']);
-      ob_end_clean();
+        ob_start();
+        $value = eval($settings['code']);
+        ob_end_clean();
     }
-  }
-  else {
+    }
+    else {
     $value = $settings['value'];
-  }
-  return $value;
+    }
+    return $value;
 }
 
 /**
@@ -329,20 +329,20 @@ 
  * @param $value The value to check for.
  */
 function _content_rules_field_has_value($node_value, $value) {
-  if (count($value) != count($node_value)) {
+    if (count($value) != count($node_value)) {
     return FALSE;
-  }
-  // Loop over multiple fields
-  foreach ($value as $delta => $sub_value) {
+    }
+    // Loop over multiple fields
+    foreach ($value as $delta => $sub_value) {
     // Check if all properties of the value are there in the node value too
     if (is_array($sub_value) && is_array($node_value[$delta])) {
-      if (count(array_diff_assoc($sub_value, $node_value[$delta])) != 0) {
+        if (count(array_diff_assoc($sub_value, $node_value[$delta])) != 0) {
         return FALSE;
-      }
+        }
     }
     elseif ($sub_value !== $node_value[$delta]) {
-      return FALSE;
+        return FALSE;
+    }
     }
-  }
-  return TRUE;
+    return TRUE;
 }

Spacing +5 added lines, -5 removed lines

@@ -73,8 +73,8 @@ 
     $form['#node'] = (object)array('type' => '', $settings['field_name'] => $settings['value']);
     $form['#field_info'][$field['field_name']] = $field;
     // We can't put it into $form['settings'] as this would break AHAH callbacks
-    $form += (array) content_field_form($form, $form_state, $field);
-    $form[ $settings['field_name'] ]['#weight'] = 4;
+    $form += (array)content_field_form($form, $form_state, $field);
+    $form[$settings['field_name']]['#weight'] = 4;
 
     unset($form['#cache']);
 
@@ -108,7 +108,7 @@ 
     // Add this file to be included when the form is built by rules
     // as it's needed by CCKs add more button.
     // See rules_after_build_include_files().
-    $form['#includes'][] = './'. drupal_get_path('module', 'node') .'/node.pages.inc';
+    $form['#includes'][] = './'.drupal_get_path('module', 'node').'/node.pages.inc';
   }
 }
 
@@ -135,14 +135,14 @@ 
     $settings = $form_state['element']['#settings'];
     $field = content_fields($settings['field_name']);
     $field_types = _content_field_types();
-    $function = $field_types[$field['type']]['module'] .'_field';
+    $function = $field_types[$field['type']]['module'].'_field';
     if (function_exists($function)) {
       $form['#node'] = (object)array('type' => '', $settings['field_name'] => $form_state['values'][$settings['field_name']]);
       $items = isset($form['#node']->$field['field_name']) ? $form['#node']->$field['field_name'] : array();
 
       //Make sure AHAH 'add more' button isn't sent to the fields
       // for processing.
-      unset($items[$field['field_name'] .'_add_more']);
+      unset($items[$field['field_name'].'_add_more']);
 
       $function('validate', $form['#node'], $field, $items, $form, NULL);
       content_field('validate', $form['#node'], $field, $items, $form, NULL);

Braces +5 added lines, -10 removed lines

@@ -64,8 +64,7 @@ 
     // Replace the usual submit handlers with a own handler.
     $form['submit']['#submit'] = array('content_rules_action_populate_field_form_step_submit');
     $form['submit']['#value'] = t('Continue');
-  }
-  else {
+  } else {
     // Show the fields form here.
     module_load_include('inc', 'content', 'includes/content.node_form');
     $field = content_fields($settings['field_name']);
@@ -129,8 +128,7 @@ 
     if (strpos($php, 'return') === FALSE) {
       form_set_error('code', t('You have to return the default value in the expected format.'));
     }
-  }
-  else {
+  } else {
     // Validate the field.
     $settings = $form_state['element']['#settings'];
     $field = content_fields($settings['field_name']);
@@ -306,14 +304,12 @@ 
     if (function_exists('rules_input_evaluator_php_apply')) {
       // Support adding variables to the php code, if php module is present.
       $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, FALSE);
-    }
-    else {
+    } else {
       ob_start();
       $value = eval($settings['code']);
       ob_end_clean();
     }
-  }
-  else {
+  } else {
     $value = $settings['value'];
   }
   return $value;
@@ -339,8 +335,7 @@ 
       if (count(array_diff_assoc($sub_value, $node_value[$delta])) != 0) {
         return FALSE;
       }
-    }
-    elseif ($sub_value !== $node_value[$delta]) {
+    } elseif ($sub_value !== $node_value[$delta]) {
       return FALSE;
     }
   }

drupal/sites/default/boinc/modules/contrib/cck/modules/content_copy/content_copy.module

Doc Comments +1 added lines, -1 removed lines

@@ -607,7 +607,7 @@
 }
 
 /**
- * @return a code representation of the recorded macro.
+ * @return string|null code representation of the recorded macro.
  */
 function content_copy_get_macro() {
   // Define the indexes for the evaluated code.

Indentation +273 added lines, -273 removed lines

@@ -32,174 +32,174 @@ 
  * Implementation of hook_menu().
  */
 function content_copy_menu() {
-  $items = array();
+    $items = array();
 
-  $items['admin/content/types/export'] = array(
+    $items['admin/content/types/export'] = array(
     'title' => 'Export',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('content_copy_export_form'),
     'access arguments' => array('administer content types'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 3,
-  );
-  $items['admin/content/types/import'] = array(
+    );
+    $items['admin/content/types/import'] = array(
     'title' => 'Import',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('content_copy_import_form'),
     'access arguments' => array('administer content types'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 4,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function content_copy_theme() {
-  return array(
+    return array(
     'content_copy_export_form' => array(
-      'template' => 'content_copy_export_form',
-      'arguments' => array('form' => NULL),
+        'template' => 'content_copy_export_form',
+        'arguments' => array('form' => NULL),
     ),
-  );
+    );
 }
 
 /**
  *  A form to export field definitions.
  */
 function content_copy_export_form(&$form_state) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
 
-  $form_values = isset($form_state['values']) ? $form_state['values'] : array();
-  $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
+    $form_values = isset($form_state['values']) ? $form_state['values'] : array();
+    $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
 
-  $exportable_fields = array();
-  $groups = array();
+    $exportable_fields = array();
+    $groups = array();
 
-  $type_name = isset($form_values['type_name']) ? $form_values['type_name'] : '';
-  if ($type_name) {
+    $type_name = isset($form_values['type_name']) ? $form_values['type_name'] : '';
+    if ($type_name) {
     $type = content_types($type_name);
     $exportable_fields = content_copy_fields($type_name);
     if (module_exists('fieldgroup')) {
-      $groups = fieldgroup_groups($type_name);
+        $groups = fieldgroup_groups($type_name);
+    }
     }
-  }
 
-  // If a content type has been selected and there are no fields or groups to select,
-  // jump straight to export.
-  if ($step == 2 && !($groups) && !($exportable_fields)) {
+    // If a content type has been selected and there are no fields or groups to select,
+    // jump straight to export.
+    if ($step == 2 && !($groups) && !($exportable_fields)) {
     $step = 3;
-  }
+    }
 
-  $form['#step'] = $step;
-  $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
+    $form['#step'] = $step;
+    $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
 
-  switch ($step) {
+    switch ($step) {
     case 1: // Select a content type.
       $types  = content_copy_types();
-      $form['type_name'] = array(
+        $form['type_name'] = array(
         '#title' => t('Types'),
         '#type' => 'radios',
         '#options' => $types,
         '#description' => t('Select the content type to export.'),
-      );
-      break;
+        );
+        break;
 
     case 2: // Select groups and fields.
       $form['type_name'] = array(
         '#type' => 'hidden',
         '#value' => $type_name,
-      );
+        );
 
-      $form += array(
+        $form += array(
         '#fields' => $exportable_fields,
         '#groups' => array_keys($groups),
-      );
+        );
 
-      $fields_options = $groups_options = array();
+        $fields_options = $groups_options = array();
 
-      // Fields.
-      foreach ($exportable_fields as $field_name) {
+        // Fields.
+        foreach ($exportable_fields as $field_name) {
         $field = content_fields($field_name, $type_name);
         $fields_options[$field_name] = '';
         $weight = $field['widget']['weight'];
         $form[$field_name] = array(
-          'human_name' => array('#value' => check_plain($field['widget']['label'])),
-          'field_name' => array('#value' => $field['field_name']),
-          'type' => array('#value' => $field['type']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          'parent' => array('#type' => 'value', '#value' => ''),
-          '#row_type' => 'field',
+            'human_name' => array('#value' => check_plain($field['widget']['label'])),
+            'field_name' => array('#value' => $field['field_name']),
+            'type' => array('#value' => $field['type']),
+            'weight' => array('#type' => 'value', '#value' => $weight),
+            'parent' => array('#type' => 'value', '#value' => ''),
+            '#row_type' => 'field',
         );
-      }
-      $form['fields'] = array(
+        }
+        $form['fields'] = array(
         '#type' => 'checkboxes',
         '#options' => $fields_options,
         '#default_value' => array_keys($fields_options),
-      );
+        );
 
-      // Groups.
-      foreach ($groups as $name => $group) {
+        // Groups.
+        foreach ($groups as $name => $group) {
         $groups_options[$name] = '';
         $weight = $group['weight'];
         $form[$name] = array(
-          'human_name' => array('#value' => check_plain($group['label'])),
-          'group_name' => array('#value' => $group['group_name']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          '#row_type' => 'group',
+            'human_name' => array('#value' => check_plain($group['label'])),
+            'group_name' => array('#value' => $group['group_name']),
+            'weight' => array('#type' => 'value', '#value' => $weight),
+            '#row_type' => 'group',
         );
         foreach ($group['fields'] as $field_name => $field) {
-          // Do nothing for non-exportable (inactive) fields.
-          if (isset($form[$field_name])) {
+            // Do nothing for non-exportable (inactive) fields.
+            if (isset($form[$field_name])) {
             $form[$field_name]['parent']['#value'] = $name;
-          }
+            }
+        }
         }
-      }
-      if ($groups) {
+        if ($groups) {
         $form['groups'] = array(
-          '#type' => 'checkboxes',
-          '#options' => $groups_options,
-          '#default_value' => array_keys($groups_options),
+            '#type' => 'checkboxes',
+            '#options' => $groups_options,
+            '#default_value' => array_keys($groups_options),
         );
-      }
-      break;
+        }
+        break;
 
     case 3: // Display the export macro.
       $GLOBALS['content_copy']['count'] = 0;
-      $form['export'] = array(
+        $form['export'] = array(
         '#title' => t('Export data'),
         '#type' => 'textarea',
         '#cols' => 60,
         '#value' => content_copy_export($form_values),
         '#rows' => max(40, $GLOBALS['content_copy']['count']),
         '#description' => t('Copy the export text and paste it into another content type using the import function.'),
-      );
-      // The calls to drupal_execute('content_field_edit_form') in
-      // content_copy_export() affect the page title,
-      drupal_set_title(t('Content types'));
-      break;
-  }
-
-  if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
+        );
+        // The calls to drupal_execute('content_field_edit_form') in
+        // content_copy_export() affect the page title,
+        drupal_set_title(t('Content types'));
+        break;
+    }
+
+    if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
     $form['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Export'),
+        '#type' => 'submit',
+        '#value' => t('Export'),
     );
-  }
+    }
 
-  $form['step'] = array(
+    $form['step'] = array(
     '#type' => 'value',
     '#value' => $step,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function content_copy_export_form_submit($form, &$form_state) {
-  $form_state['rebuild'] = TRUE;
-  $form_state['storage']['step'] = $form_state['values']['step'];
+    $form_state['rebuild'] = TRUE;
+    $form_state['storage']['step'] = $form_state['values']['step'];
 }
 
 
@@ -208,66 +208,66 @@ 
  *   and save the form values as formatted text.
  */
 function content_copy_export($form_values) {
-  // Set a global variable to tell when to intervene with form_alter().
-  $GLOBALS['content_copy']['status'] = 'export';
+    // Set a global variable to tell when to intervene with form_alter().
+    $GLOBALS['content_copy']['status'] = 'export';
 
-  // Get the content type info by submitting the content type form.
-  $node_state = array('values' => array('type_name' => $form_values['type_name']));
-  module_load_include('inc', 'node', 'content_types');
-  drupal_execute('node_type_form', $node_state, node_get_types('type', $form_values['type_name']));
+    // Get the content type info by submitting the content type form.
+    $node_state = array('values' => array('type_name' => $form_values['type_name']));
+    module_load_include('inc', 'node', 'content_types');
+    drupal_execute('node_type_form', $node_state, node_get_types('type', $form_values['type_name']));
 
-  module_load_include('inc', 'content', 'includes/content.admin');
-  module_load_include('inc', 'content', 'includes/content.crud');
+    module_load_include('inc', 'content', 'includes/content.admin');
+    module_load_include('inc', 'content', 'includes/content.crud');
 
-  // Get an array of groups to export.
-  // Record a macro for each group by submitting the group edit form.
-  $groups = array();
-  if (!empty($form_values['groups']) && module_exists('fieldgroup')) {
+    // Get an array of groups to export.
+    // Record a macro for each group by submitting the group edit form.
+    $groups = array();
+    if (!empty($form_values['groups']) && module_exists('fieldgroup')) {
     $groups = array_filter($form_values['groups']);
     foreach ($groups as $group) {
-      $group_state = array('values' => array('group_name' => $group));
-      drupal_execute('fieldgroup_group_edit_form', $group_state, $form_values['type_name'], $group, 'edit');
+        $group_state = array('values' => array('group_name' => $group));
+        drupal_execute('fieldgroup_group_edit_form', $group_state, $form_values['type_name'], $group, 'edit');
+    }
     }
-  }
 
-  // Get an array of fields to export
-  // Record a macro for each field by submitting the field settings form.
-  // Omit fields from the export if their module is not currently installed
-  // otherwise the system will generate errors when the macro tries to execute their forms.
-  if (!empty($form_values['fields'])) {
+    // Get an array of fields to export
+    // Record a macro for each field by submitting the field settings form.
+    // Omit fields from the export if their module is not currently installed
+    // otherwise the system will generate errors when the macro tries to execute their forms.
+    if (!empty($form_values['fields'])) {
     $type = content_types($form_values['type_name']);
     $fields = array_filter($form_values['fields']);
     foreach ($fields as $field_name) {
-      $field = $type['fields'][$field_name];
-      $field_types = _content_field_types();
-      $field_module = $field_types[$field['type']]['module'];
-      $widget_types = _content_widget_types();
-      $widget_module = $widget_types[$field['widget']['type']]['module'];
-      if (!empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
+        $field = $type['fields'][$field_name];
+        $field_types = _content_field_types();
+        $field_module = $field_types[$field['type']]['module'];
+        $widget_types = _content_widget_types();
+        $widget_module = $widget_types[$field['widget']['type']]['module'];
+        if (!empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
         $field_state = array('values' => content_field_instance_collapse($field));
         $field_state['values']['op'] = t('Save field settings');
         if (module_exists('fieldgroup')) {
-          // Avoid undefined index error by always creating this.
-          $field_state['values']['group'] = '';
-          $group_name = fieldgroup_get_group($form_values['type_name'], $field_name);
-          if (in_array($group_name, $groups)) {
+            // Avoid undefined index error by always creating this.
+            $field_state['values']['group'] = '';
+            $group_name = fieldgroup_get_group($form_values['type_name'], $field_name);
+            if (in_array($group_name, $groups)) {
             $field_state['values']['group'] = $group_name;
-          }
+            }
         }
         drupal_execute('content_field_edit_form', $field_state, $form_values['type_name'], $field_name);
-      }
+        }
+    }
     }
-  }
 
-  // Convert the macro array into formatted text.
-  $output = content_copy_get_macro();
+    // Convert the macro array into formatted text.
+    $output = content_copy_get_macro();
 
-  // Add weights of non-CCK fields.
-  if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
+    // Add weights of non-CCK fields.
+    if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
     $output .= "\$content['extra']  = ". var_export((array) $extra, TRUE) .";\n";
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -294,37 +294,37 @@ 
  * }
  */
 function content_copy_import_form(&$form_state, $type_name = '') {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
 
-  $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
-  $form['type_name'] = array(
+    $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
+    $form['type_name'] = array(
     '#type' => 'select',
     '#options' => array('<create>' => t('<Create>')) + content_copy_types(),
     '#default_value' => $type_name,
     '#title' => t('Content type'),
     '#description' => t('Select the content type to import these fields into.<br/>Select &lt;Create&gt; to create a new content type to contain the fields.'),
-  );
-  $form['macro'] = array(
+    );
+    $form['macro'] = array(
     '#type' => 'textarea',
     '#rows' => 40,
     '#title' => t('Import data'),
     '#required' => TRUE,
     '#description' => t('Paste the text created by a content export into this field.'),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Import'),
-  );
-  // Read in a file if there is one and set it as the default macro value.
-  if (isset($_REQUEST['macro_file']) && $file = file_get_contents($_REQUEST['macro_file'])) {
+    );
+    // Read in a file if there is one and set it as the default macro value.
+    if (isset($_REQUEST['macro_file']) && $file = file_get_contents($_REQUEST['macro_file'])) {
     $form['macro']['#default_value'] = $file;
     if (isset($_REQUEST['type_name'])) {
-      $form['type_name']['#default_value'] = $_REQUEST['type_name'];
+        $form['type_name']['#default_value'] = $_REQUEST['type_name'];
     }
     $form['#prefix'] .= '<p class="error">'. t('A file has been pre-loaded for import.') .'</p>';
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
@@ -334,90 +334,90 @@ 
  *     2) execute the imported field macro to update the settings to the imported values
  */
 function content_copy_import_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
+    $form_values = $form_state['values'];
 
-  // Get the content type we are importing into.
-  $type_name = $form_values['type_name'];
-  $type_label = node_get_types('name', $type_name);
+    // Get the content type we are importing into.
+    $type_name = $form_values['type_name'];
+    $type_label = node_get_types('name', $type_name);
 
-  $content = NULL;
-  // Convert the import formatted text back into a $content array.
-  // Return if errors generated or not an array.
-  // Use '@' to suppress errors about undefined constants in the macro.
-  @eval($form_values['macro']);
+    $content = NULL;
+    // Convert the import formatted text back into a $content array.
+    // Return if errors generated or not an array.
+    // Use '@' to suppress errors about undefined constants in the macro.
+    @eval($form_values['macro']);
 
-  // Preliminary error trapping, must have valid arrays to work with.
-  if (!isset($content) || !isset($content['type']) || !is_array($content) || !is_array($content['type'])) {
+    // Preliminary error trapping, must have valid arrays to work with.
+    if (!isset($content) || !isset($content['type']) || !is_array($content) || !is_array($content['type'])) {
     form_set_error('macro', t('The import data is not valid import text.'));
     return;
-  }
+    }
 
-  module_load_include('inc', 'content', 'includes/content.crud');
+    module_load_include('inc', 'content', 'includes/content.crud');
 
-  // Get all type and field info for this database.
-  $content_info = _content_type_info();
+    // Get all type and field info for this database.
+    $content_info = _content_type_info();
 
-  $imported_type = $content['type'];
-  $imported_type_name = $imported_type['type'];
-  $imported_type_label = $imported_type['name'];
+    $imported_type = $content['type'];
+    $imported_type_name = $imported_type['type'];
+    $imported_type_label = $imported_type['name'];
 
-  // It is allowed to import a type with no fields,
-  // so the fields array could be empty and must be cast as an array.
-  $imported_fields = isset($content['fields']) ? $content['fields'] : array();
+    // It is allowed to import a type with no fields,
+    // so the fields array could be empty and must be cast as an array.
+    $imported_fields = isset($content['fields']) ? $content['fields'] : array();
 
-  // Perform more pre-import error trapping.
-  // If there are potential problems, exit without doing the import.
-  $not_enabled = array();
+    // Perform more pre-import error trapping.
+    // If there are potential problems, exit without doing the import.
+    $not_enabled = array();
 
-  // The groups array could be empty and still valid, make sure to cast it as an array.
-  // If there are groups in the import, make sure the fieldgroup module is enabled.
-  $imported_groups = array();
-  if (isset($content['groups']) && module_exists('fieldgroup')) {
+    // The groups array could be empty and still valid, make sure to cast it as an array.
+    // If there are groups in the import, make sure the fieldgroup module is enabled.
+    $imported_groups = array();
+    if (isset($content['groups']) && module_exists('fieldgroup')) {
     $imported_groups = (array) $content['groups'];
-  }
-  elseif (isset($content['groups']) && is_array($content['groups'])) {
+    }
+    elseif (isset($content['groups']) && is_array($content['groups'])) {
     $not_enabled[] = 'fieldgroup';
-  }
+    }
 
-  // Make sure that all the field and widget modules in the import are enabled in this database.
-  foreach ($imported_fields as $import) {
+    // Make sure that all the field and widget modules in the import are enabled in this database.
+    foreach ($imported_fields as $import) {
     $field = content_field_instance_collapse($import);
     if (empty($field['module']) || empty($field['widget_module'])) {
-      $not_enabled[] = $field['field_name'];
+        $not_enabled[] = $field['field_name'];
     }
     else {
-      if (!module_exists($field['module'])) {
+        if (!module_exists($field['module'])) {
         $not_enabled[] = $field['module'];
-      }
-      if (!module_exists($field['widget_module'])) {
+        }
+        if (!module_exists($field['widget_module'])) {
         $not_enabled[] = $field['widget_module'];
-      }
+        }
+    }
     }
-  }
 
-  // If any required module is not enabled, set an error message and exit.
-  if ($not_enabled) {
+    // If any required module is not enabled, set an error message and exit.
+    if ($not_enabled) {
     form_set_error('macro', t('The following modules must be enabled for this import to work: %modules.', array(
         '%modules' => implode(', ', array_unique($not_enabled))
         )));
-  }
+    }
 
-  // Make sure the imported content type doesn't already exist in the database.
-  if ($form_values['type_name'] == '<create>') {
+    // Make sure the imported content type doesn't already exist in the database.
+    if ($form_values['type_name'] == '<create>') {
     if (in_array($imported_type_name, array_keys($content_info['content types']))) {
-      form_set_error('macro', t('The content type %type already exists in this database.', array(
+        form_set_error('macro', t('The content type %type already exists in this database.', array(
             '%type' => $imported_type_name
             )));
     }
-  }
+    }
 
-  if (form_get_errors()) {
+    if (form_get_errors()) {
     drupal_set_message(t('Exiting. No import performed.'), 'error');
     return;
-  }
+    }
 
-  // Create the content type, if requested.
-  if ($form_values['type_name'] == '<create>') {
+    // Create the content type, if requested.
+    if ($form_values['type_name'] == '<create>') {
 
     $type = (object) $imported_type;
     $values = $imported_type;
@@ -435,26 +435,26 @@ 
     $content_info = _content_type_info();
 
     if (form_get_errors() || !isset($content_info['content types']) || !is_array($content_info['content types'][$type_name])) {
-       drupal_set_message(t('An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.', array(
+        drupal_set_message(t('An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.', array(
             '%type' => $imported_type_name
             )));
-       return;
+        return;
+    }
     }
-  }
 
-  // Create the groups for this type, if they don't already exist.
-  if (module_exists('fieldgroup') && $imported_groups) {
+    // Create the groups for this type, if they don't already exist.
+    if (module_exists('fieldgroup') && $imported_groups) {
     foreach ($imported_groups as $group) {
-      $group_name = $group['group_name'];
-      fieldgroup_save_group($type_name, $group);
+        $group_name = $group['group_name'];
+        fieldgroup_save_group($type_name, $group);
     }
     // Reset the static variable in fieldgroup_groups() with new data.
     fieldgroup_groups('', FALSE, TRUE);
-  }
+    }
 
-  // Iterate through the field forms in the import and execute each.
-  $rebuild = FALSE;
-  foreach ($imported_fields as $field) {
+    // Iterate through the field forms in the import and execute each.
+    $rebuild = FALSE;
+    foreach ($imported_fields as $field) {
 
     // Make sure the field doesn't already exist in the type.
     // If so, do nothing, fields can't be duplicated within a content type.
@@ -464,13 +464,13 @@ 
     $field['type_name'] = $type_name;
 
     if (!empty($field['field_name']) && isset($content_info['content types'][$type_name]['fields'][$field_name])) {
-      drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
+        drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
         '%field_label' => $field['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
     else {
-      $field = content_field_instance_create($field, FALSE);
-      $rebuild = TRUE;
-      drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
+        $field = content_field_instance_create($field, FALSE);
+        $rebuild = TRUE;
+        drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
         '%field_label' => $field['widget']['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
 
@@ -480,20 +480,20 @@ 
     // restored. Hence, we need to update field group data for newly imported
     // field, but also for fields that already exist.
     if (module_exists('fieldgroup') && isset($imported_groups)) {
-      fieldgroup_update_fields($field);
+        fieldgroup_update_fields($field);
+    }
     }
-  }
 
-  // Clear caches and rebuild menu only if any field has been created.
-  if ($rebuild) {
+    // Clear caches and rebuild menu only if any field has been created.
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 
-  // Import weights of non-CCK fields.
-  if (isset($content['extra'])) {
+    // Import weights of non-CCK fields.
+    if (isset($content['extra'])) {
     variable_set('content_extra_weights_'. $type_name, $content['extra']);
-  }
+    }
 }
 
 /**
@@ -501,22 +501,22 @@ 
  * Intervene to run form through macro when doing export
  */
 function content_copy_form_alter(&$form, $form_state, $form_id) {
-  $alter_forms = array('node_type_form', 'content_field_edit_form', 'fieldgroup_group_edit_form');
-  if (isset($GLOBALS['content_copy']) && isset($GLOBALS['content_copy']['status']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
+    $alter_forms = array('node_type_form', 'content_field_edit_form', 'fieldgroup_group_edit_form');
+    if (isset($GLOBALS['content_copy']) && isset($GLOBALS['content_copy']['status']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
     $form['#submit'][] = 'content_copy_record_macro';
-  }
+    }
 }
 
 /**
  * Get all the *active* fields for a content type.
  */
 function content_copy_fields($type_name) {
-  $fields = array();
-  if (!$type_name) {
+    $fields = array();
+    if (!$type_name) {
     return $fields;
-  }
-  $content_info = _content_type_info();
-  foreach ($content_info['content types'][$type_name]['fields'] as $field_name => $field) {
+    }
+    $content_info = _content_type_info();
+    foreach ($content_info['content types'][$type_name]['fields'] as $field_name => $field) {
     // Omit fields from the export if their module is not currently installed
     // otherwise the system will generate errors when the macro tries to execute their forms.
     $field_types = _content_field_types();
@@ -525,125 +525,125 @@ 
     $widget_module = $widget_types[$field['widget']['type']]['module'];
 
     if (!$field['locked'] && !empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
-      $fields[] = $field_name;
+        $fields[] = $field_name;
     }
-  }
-  return $fields;
+    }
+    return $fields;
 }
 
 /**
  *  Get all content types.
  */
 function content_copy_types() {
-  $types = array();
-  $content_info = _content_type_info();
-  foreach ($content_info['content types'] as $type_name => $val) {
+    $types = array();
+    $content_info = _content_type_info();
+    foreach ($content_info['content types'] as $type_name => $val) {
     $types[$type_name] = check_plain($val['name']) .' ('. $type_name .')';
-  }
-  return $types;
+    }
+    return $types;
 }
 
 /**
  * A handler that stores the form submissions into a $GLOBALS array
  */
 function content_copy_record_macro($form, &$form_state) {
-  $edit = $form_state['values'];
-  $subs = isset($GLOBALS['content_copy']['submissions']) ? $GLOBALS['content_copy']['submissions'] : array();
+    $edit = $form_state['values'];
+    $subs = isset($GLOBALS['content_copy']['submissions']) ? $GLOBALS['content_copy']['submissions'] : array();
 
-  // Get the form values and store them in a $GLOBALS['content_copy']['submissions'] array.
-  // Update $GLOBALS['content_copy']['count'] with an approximation of the number of rows in this item.
-  // Count is used to approximate necessary size of textarea in form.
+    // Get the form values and store them in a $GLOBALS['content_copy']['submissions'] array.
+    // Update $GLOBALS['content_copy']['count'] with an approximation of the number of rows in this item.
+    // Count is used to approximate necessary size of textarea in form.
 
-  $form_id = $form_state['values']['form_id'];
-  if (isset($edit['type_name']) || isset($edit['submit']) || isset($edit['delete']) || isset($edit['form_id'])) {
+    $form_id = $form_state['values']['form_id'];
+    if (isset($edit['type_name']) || isset($edit['submit']) || isset($edit['delete']) || isset($edit['form_id'])) {
     unset($edit['type_name'], $edit['submit'], $edit['delete'], $edit['form_id'], $edit['previous_field']);
-  }
-  switch ($form_id) {
+    }
+    switch ($form_id) {
     case 'node_type_form':
       $subs['type'] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
 
     case 'fieldgroup_group_edit_form':
       $subs['groups'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
 
     default:
       if (isset($edit['field_widget_type'])) {
         $tmp = explode('-', $edit['field_widget_type']);
         $field_name = $tmp[0];
-      }
-      else {
+        }
+        else {
         $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
-      }
+        }
 
-      // The display settings are being fetched directly from the DB. During import,
-      // we'll re-insert the data directly as well.
-      //
-      $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
-      $row_info = db_fetch_array(db_query($query, $field_name));
+        // The display settings are being fetched directly from the DB. During import,
+        // we'll re-insert the data directly as well.
+        //
+        $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
+        $row_info = db_fetch_array(db_query($query, $field_name));
 
-      // If an error occurs, notify the user.
-      if ($db_err = db_error()) {
+        // If an error occurs, notify the user.
+        if ($db_err = db_error()) {
         drupal_set_message(t("An error occurred when exporting the 'display settings' data for the field %field_name.<br/>The db error is: '%db_err'.", array(
-             '%field_name' => $field_name,
-             '%db_err' => $db_err
+                '%field_name' => $field_name,
+                '%db_err' => $db_err
         )));
-      }
-      else {
+        }
+        else {
         // The db fetch occurred successfully, unserialize the data blob and
         // insert it into a new "display_settings" field of the data.
         if ($display_settings = unserialize($row_info['display_settings'])) {
-          $edit['display_settings'] = $display_settings;
+            $edit['display_settings'] = $display_settings;
         }
-      }
-      $subs['fields'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
-  }
+        }
+        $subs['fields'][] = $edit;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
+    }
 
-  $GLOBALS['content_copy']['submissions'] = $subs;
+    $GLOBALS['content_copy']['submissions'] = $subs;
 }
 
 /**
  * @return a code representation of the recorded macro.
  */
 function content_copy_get_macro() {
-  // Define the indexes for the evaluated code.
-  $string = "";
-  if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
+    // Define the indexes for the evaluated code.
+    $string = "";
+    if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
     foreach ($GLOBALS['content_copy']['submissions'] as $form_type => $form) {
-      $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
+        $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
     }
     return $string;
-  }
+    }
 }
 
 function template_preprocess_content_copy_export_form($vars) {
-  $form = &$vars['form'];
+    $form = &$vars['form'];
 
-  if ($form['#step'] == 2) {
+    if ($form['#step'] == 2) {
     $order = _content_overview_order($form, $form['#fields'], $form['#groups']);
 
     $rows = array();
     foreach ($order as $key) {
-      $element = &$form[$key];
-      $row = new stdClass();
+        $element = &$form[$key];
+        $row = new stdClass();
 
-      $row->row_type = $element['#row_type'];
-      $checkbox_key = $element['#row_type'] == 'field' ? 'fields' : 'groups';
-      $row->checkbox = drupal_render($form[$checkbox_key][$key]);
-      foreach (element_children($element) as $child) {
+        $row->row_type = $element['#row_type'];
+        $checkbox_key = $element['#row_type'] == 'field' ? 'fields' : 'groups';
+        $row->checkbox = drupal_render($form[$checkbox_key][$key]);
+        foreach (element_children($element) as $child) {
         $row->{$child} = drupal_render($element[$child]);
-      }
-      $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
-      $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
+        }
+        $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
+        $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
 
-      $rows[] = $row;
+        $rows[] = $row;
     }
     $vars['rows'] = $rows;
-  }
+    }
 
-  $vars['submit'] = drupal_render($form);
+    $vars['submit'] = drupal_render($form);
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -69,8 +69,8 @@ 
  *  A form to export field definitions.
  */
 function content_copy_export_form(&$form_state) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'node').'/content_types.inc');
 
   $form_values = isset($form_state['values']) ? $form_state['values'] : array();
   $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
@@ -98,7 +98,7 @@ 
 
   switch ($step) {
     case 1: // Select a content type.
-      $types  = content_copy_types();
+      $types = content_copy_types();
       $form['type_name'] = array(
         '#title' => t('Types'),
         '#type' => 'radios',
@@ -263,8 +263,8 @@ 
   $output = content_copy_get_macro();
 
   // Add weights of non-CCK fields.
-  if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
-    $output .= "\$content['extra']  = ". var_export((array) $extra, TRUE) .";\n";
+  if ($extra = variable_get('content_extra_weights_'.$form_values['type_name'], array())) {
+    $output .= "\$content['extra']  = ".var_export((array)$extra, TRUE).";\n";
   }
 
   return $output;
@@ -294,8 +294,8 @@ 
  * }
  */
 function content_copy_import_form(&$form_state, $type_name = '') {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'node').'/content_types.inc');
 
   $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
   $form['type_name'] = array(
@@ -322,7 +322,7 @@ 
     if (isset($_REQUEST['type_name'])) {
       $form['type_name']['#default_value'] = $_REQUEST['type_name'];
     }
-    $form['#prefix'] .= '<p class="error">'. t('A file has been pre-loaded for import.') .'</p>';
+    $form['#prefix'] .= '<p class="error">'.t('A file has been pre-loaded for import.').'</p>';
   }
   return $form;
 }
@@ -373,7 +373,7 @@ 
   // If there are groups in the import, make sure the fieldgroup module is enabled.
   $imported_groups = array();
   if (isset($content['groups']) && module_exists('fieldgroup')) {
-    $imported_groups = (array) $content['groups'];
+    $imported_groups = (array)$content['groups'];
   }
   elseif (isset($content['groups']) && is_array($content['groups'])) {
     $not_enabled[] = 'fieldgroup';
@@ -419,7 +419,7 @@ 
   // Create the content type, if requested.
   if ($form_values['type_name'] == '<create>') {
 
-    $type = (object) $imported_type;
+    $type = (object)$imported_type;
     $values = $imported_type;
     // Prevent a warning in node/content_types.inc
     $type->has_title = TRUE;
@@ -458,7 +458,7 @@ 
 
     // Make sure the field doesn't already exist in the type.
     // If so, do nothing, fields can't be duplicated within a content type.
-    $field_name   = $field['field_name'];
+    $field_name = $field['field_name'];
 
     // Might need to overwrite the content type name if a new type was created.
     $field['type_name'] = $type_name;
@@ -492,7 +492,7 @@ 
 
   // Import weights of non-CCK fields.
   if (isset($content['extra'])) {
-    variable_set('content_extra_weights_'. $type_name, $content['extra']);
+    variable_set('content_extra_weights_'.$type_name, $content['extra']);
   }
 }
 
@@ -538,7 +538,7 @@ 
   $types = array();
   $content_info = _content_type_info();
   foreach ($content_info['content types'] as $type_name => $val) {
-    $types[$type_name] = check_plain($val['name']) .' ('. $type_name .')';
+    $types[$type_name] = check_plain($val['name']).' ('.$type_name.')';
   }
   return $types;
 }
@@ -581,7 +581,7 @@ 
       // The display settings are being fetched directly from the DB. During import,
       // we'll re-insert the data directly as well.
       //
-      $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
+      $query = 'SELECT display_settings FROM {'.content_instance_tablename().'} WHERE field_name = \'%s\'';
       $row_info = db_fetch_array(db_query($query, $field_name));
 
       // If an error occurs, notify the user.
@@ -614,7 +614,7 @@ 
   $string = "";
   if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
     foreach ($GLOBALS['content_copy']['submissions'] as $form_type => $form) {
-      $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
+      $string .= "\$content['$form_type']  = ".var_export((array)$form, TRUE).";\n";
     }
     return $string;
   }

Braces +5 added lines, -10 removed lines

@@ -374,8 +374,7 @@ 
   $imported_groups = array();
   if (isset($content['groups']) && module_exists('fieldgroup')) {
     $imported_groups = (array) $content['groups'];
-  }
-  elseif (isset($content['groups']) && is_array($content['groups'])) {
+  } elseif (isset($content['groups']) && is_array($content['groups'])) {
     $not_enabled[] = 'fieldgroup';
   }
 
@@ -384,8 +383,7 @@ 
     $field = content_field_instance_collapse($import);
     if (empty($field['module']) || empty($field['widget_module'])) {
       $not_enabled[] = $field['field_name'];
-    }
-    else {
+    } else {
       if (!module_exists($field['module'])) {
         $not_enabled[] = $field['module'];
       }
@@ -466,8 +464,7 @@ 
     if (!empty($field['field_name']) && isset($content_info['content types'][$type_name]['fields'][$field_name])) {
       drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
         '%field_label' => $field['label'], '%field_name' => $field_name, '%type' => $type_label)));
-    }
-    else {
+    } else {
       $field = content_field_instance_create($field, FALSE);
       $rebuild = TRUE;
       drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
@@ -573,8 +570,7 @@ 
       if (isset($edit['field_widget_type'])) {
         $tmp = explode('-', $edit['field_widget_type']);
         $field_name = $tmp[0];
-      }
-      else {
+      } else {
         $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
       }
 
@@ -590,8 +586,7 @@ 
              '%field_name' => $field_name,
              '%db_err' => $db_err
         )));
-      }
-      else {
+      } else {
         // The db fetch occurred successfully, unserialize the data blob and
         // insert it into a new "display_settings" field of the data.
         if ($display_settings = unserialize($row_info['display_settings'])) {

Switch Indentation +123 added lines, -123 removed lines

@@ -97,89 +97,89 @@ 
   $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
 
   switch ($step) {
-    case 1: // Select a content type.
-      $types  = content_copy_types();
-      $form['type_name'] = array(
-        '#title' => t('Types'),
-        '#type' => 'radios',
-        '#options' => $types,
-        '#description' => t('Select the content type to export.'),
-      );
-      break;
-
-    case 2: // Select groups and fields.
-      $form['type_name'] = array(
-        '#type' => 'hidden',
-        '#value' => $type_name,
-      );
-
-      $form += array(
-        '#fields' => $exportable_fields,
-        '#groups' => array_keys($groups),
-      );
-
-      $fields_options = $groups_options = array();
-
-      // Fields.
-      foreach ($exportable_fields as $field_name) {
-        $field = content_fields($field_name, $type_name);
-        $fields_options[$field_name] = '';
-        $weight = $field['widget']['weight'];
-        $form[$field_name] = array(
-          'human_name' => array('#value' => check_plain($field['widget']['label'])),
-          'field_name' => array('#value' => $field['field_name']),
-          'type' => array('#value' => $field['type']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          'parent' => array('#type' => 'value', '#value' => ''),
-          '#row_type' => 'field',
-        );
-      }
-      $form['fields'] = array(
-        '#type' => 'checkboxes',
-        '#options' => $fields_options,
-        '#default_value' => array_keys($fields_options),
-      );
-
-      // Groups.
-      foreach ($groups as $name => $group) {
-        $groups_options[$name] = '';
-        $weight = $group['weight'];
-        $form[$name] = array(
-          'human_name' => array('#value' => check_plain($group['label'])),
-          'group_name' => array('#value' => $group['group_name']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          '#row_type' => 'group',
-        );
-        foreach ($group['fields'] as $field_name => $field) {
-          // Do nothing for non-exportable (inactive) fields.
-          if (isset($form[$field_name])) {
-            $form[$field_name]['parent']['#value'] = $name;
-          }
-        }
-      }
-      if ($groups) {
-        $form['groups'] = array(
-          '#type' => 'checkboxes',
-          '#options' => $groups_options,
-          '#default_value' => array_keys($groups_options),
-        );
-      }
-      break;
-
-    case 3: // Display the export macro.
-      $GLOBALS['content_copy']['count'] = 0;
-      $form['export'] = array(
-        '#title' => t('Export data'),
-        '#type' => 'textarea',
-        '#cols' => 60,
-        '#value' => content_copy_export($form_values),
-        '#rows' => max(40, $GLOBALS['content_copy']['count']),
-        '#description' => t('Copy the export text and paste it into another content type using the import function.'),
-      );
-      // The calls to drupal_execute('content_field_edit_form') in
-      // content_copy_export() affect the page title,
-      drupal_set_title(t('Content types'));
-      break;
+  case 1: // Select a content type.
+  $types  = content_copy_types();
+  $form['type_name'] = array(
+  '#title' => t('Types'),
+  '#type' => 'radios',
+  '#options' => $types,
+  '#description' => t('Select the content type to export.'),
+  );
+  break;
+
+  case 2: // Select groups and fields.
+  $form['type_name'] = array(
+  '#type' => 'hidden',
+  '#value' => $type_name,
+  );
+
+  $form += array(
+  '#fields' => $exportable_fields,
+  '#groups' => array_keys($groups),
+  );
+
+  $fields_options = $groups_options = array();
+
+  // Fields.
+  foreach ($exportable_fields as $field_name) {
+  $field = content_fields($field_name, $type_name);
+  $fields_options[$field_name] = '';
+  $weight = $field['widget']['weight'];
+  $form[$field_name] = array(
+    'human_name' => array('#value' => check_plain($field['widget']['label'])),
+    'field_name' => array('#value' => $field['field_name']),
+    'type' => array('#value' => $field['type']),
+    'weight' => array('#type' => 'value', '#value' => $weight),
+    'parent' => array('#type' => 'value', '#value' => ''),
+    '#row_type' => 'field',
+  );
+  }
+  $form['fields'] = array(
+  '#type' => 'checkboxes',
+  '#options' => $fields_options,
+  '#default_value' => array_keys($fields_options),
+  );
+
+  // Groups.
+  foreach ($groups as $name => $group) {
+  $groups_options[$name] = '';
+  $weight = $group['weight'];
+  $form[$name] = array(
+    'human_name' => array('#value' => check_plain($group['label'])),
+    'group_name' => array('#value' => $group['group_name']),
+    'weight' => array('#type' => 'value', '#value' => $weight),
+    '#row_type' => 'group',
+  );
+  foreach ($group['fields'] as $field_name => $field) {
+    // Do nothing for non-exportable (inactive) fields.
+    if (isset($form[$field_name])) {
+      $form[$field_name]['parent']['#value'] = $name;
+    }
+  }
+  }
+  if ($groups) {
+  $form['groups'] = array(
+    '#type' => 'checkboxes',
+    '#options' => $groups_options,
+    '#default_value' => array_keys($groups_options),
+  );
+  }
+  break;
+
+  case 3: // Display the export macro.
+  $GLOBALS['content_copy']['count'] = 0;
+  $form['export'] = array(
+  '#title' => t('Export data'),
+  '#type' => 'textarea',
+  '#cols' => 60,
+  '#value' => content_copy_export($form_values),
+  '#rows' => max(40, $GLOBALS['content_copy']['count']),
+  '#description' => t('Copy the export text and paste it into another content type using the import function.'),
+  );
+  // The calls to drupal_execute('content_field_edit_form') in
+  // content_copy_export() affect the page title,
+  drupal_set_title(t('Content types'));
+  break;
   }
 
   if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
@@ -559,48 +559,48 @@ 
     unset($edit['type_name'], $edit['submit'], $edit['delete'], $edit['form_id'], $edit['previous_field']);
   }
   switch ($form_id) {
-    case 'node_type_form':
-      $subs['type'] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
-
-    case 'fieldgroup_group_edit_form':
-      $subs['groups'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
-
-    default:
-      if (isset($edit['field_widget_type'])) {
-        $tmp = explode('-', $edit['field_widget_type']);
-        $field_name = $tmp[0];
-      }
-      else {
-        $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
-      }
+  case 'node_type_form':
+    $subs['type'] = $edit;
+    $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+    break;
+
+  case 'fieldgroup_group_edit_form':
+    $subs['groups'][] = $edit;
+    $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+    break;
+
+  default:
+    if (isset($edit['field_widget_type'])) {
+      $tmp = explode('-', $edit['field_widget_type']);
+      $field_name = $tmp[0];
+    }
+    else {
+      $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
+    }
 
-      // The display settings are being fetched directly from the DB. During import,
-      // we'll re-insert the data directly as well.
-      //
-      $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
-      $row_info = db_fetch_array(db_query($query, $field_name));
-
-      // If an error occurs, notify the user.
-      if ($db_err = db_error()) {
-        drupal_set_message(t("An error occurred when exporting the 'display settings' data for the field %field_name.<br/>The db error is: '%db_err'.", array(
-             '%field_name' => $field_name,
-             '%db_err' => $db_err
-        )));
-      }
-      else {
-        // The db fetch occurred successfully, unserialize the data blob and
-        // insert it into a new "display_settings" field of the data.
-        if ($display_settings = unserialize($row_info['display_settings'])) {
-          $edit['display_settings'] = $display_settings;
-        }
+    // The display settings are being fetched directly from the DB. During import,
+    // we'll re-insert the data directly as well.
+    //
+    $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
+    $row_info = db_fetch_array(db_query($query, $field_name));
+
+    // If an error occurs, notify the user.
+    if ($db_err = db_error()) {
+      drupal_set_message(t("An error occurred when exporting the 'display settings' data for the field %field_name.<br/>The db error is: '%db_err'.", array(
+           '%field_name' => $field_name,
+           '%db_err' => $db_err
+      )));
+    }
+    else {
+      // The db fetch occurred successfully, unserialize the data blob and
+      // insert it into a new "display_settings" field of the data.
+      if ($display_settings = unserialize($row_info['display_settings'])) {
+        $edit['display_settings'] = $display_settings;
       }
-      $subs['fields'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+    }
+    $subs['fields'][] = $edit;
+    $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+    break;
   }
 
   $GLOBALS['content_copy']['submissions'] = $subs;

drupal/sites/default/boinc/modules/contrib/cck/modules/nodereference/nodereference.module

Doc Comments +1 added lines, -1 removed lines

@@ -788,7 +788,7 @@
  * @param $ids
  *   Optional node ids to lookup (the $string and $match arguments will be
  *   ignored).
- * @param $limit
+ * @param integer $limit
  *   If non-zero, limit the size of the result set.
  *
  * @return

Indentation +360 added lines, -360 removed lines

@@ -10,230 +10,230 @@ 
  * Implementation of hook_menu().
  */
 function nodereference_menu() {
-  $items = array();
-  $items['nodereference/autocomplete'] = array(
+    $items = array();
+    $items['nodereference/autocomplete'] = array(
     'title' => 'Nodereference autocomplete',
     'page callback' => 'nodereference_autocomplete',
     'access callback' => 'nodereference_autocomplete_access',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function nodereference_theme() {
-  return array(
+    return array(
     'nodereference_select' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'nodereference_buttons' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'nodereference_autocomplete' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'nodereference_formatter_default' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
     'nodereference_formatter_plain' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
     'nodereference_formatter_full' => array(
-      'arguments' => array('element'),
-      'function' => 'theme_nodereference_formatter_full_teaser',
+        'arguments' => array('element'),
+        'function' => 'theme_nodereference_formatter_full_teaser',
     ),
     'nodereference_formatter_teaser' => array(
-      'arguments' => array('element'),
-      'function' => 'theme_nodereference_formatter_full_teaser',
+        'arguments' => array('element'),
+        'function' => 'theme_nodereference_formatter_full_teaser',
     ),
-  );
+    );
 }
 
 /**
  * Implementaion of hook_ctools_plugin_directory().
  */
 function nodereference_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'relationships') {
+    if ($module == 'ctools' && $plugin == 'relationships') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_field_info().
  */
 function nodereference_field_info() {
-  return array(
+    return array(
     'nodereference' => array(
-      'label' => t('Node reference'),
-      'description' => t('Store the ID of a related node as an integer value.'),
+        'label' => t('Node reference'),
+        'description' => t('Store the ID of a related node as an integer value.'),
 //      'content_icon' => 'icon_content_noderef.png',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_settings().
  */
 function nodereference_field_settings($op, $field) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $form['referenceable_types'] = array(
+        $form['referenceable_types'] = array(
         '#type' => 'checkboxes',
         '#title' => t('Content types that can be referenced'),
         '#multiple' => TRUE,
         '#default_value' => is_array($field['referenceable_types']) ? $field['referenceable_types'] : array(),
         '#options' => array_map('check_plain', node_get_types('names')),
-      );
-      if (module_exists('views')) {
+        );
+        if (module_exists('views')) {
         $views = array('--' => '--');
         $all_views = views_get_all_views();
         foreach ($all_views as $view) {
-          // Only 'node' views that have fields will work for our purpose.
-          if ($view->base_table == 'node' && !empty($view->display['default']->display_options['fields'])) {
+            // Only 'node' views that have fields will work for our purpose.
+            if ($view->base_table == 'node' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
-              $views[t('Default Views')][$view->name] = $view->name;
+                $views[t('Default Views')][$view->name] = $view->name;
             }
             else {
-              $views[t('Existing Views')][$view->name] = $view->name;
+                $views[t('Existing Views')][$view->name] = $view->name;
+            }
             }
-          }
         }
 
         $form['advanced'] = array(
-           '#type' => 'fieldset',
-           '#title' => t('Advanced - Nodes that can be referenced (View)'),
-           '#collapsible' => TRUE,
-           '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
-         );
+            '#type' => 'fieldset',
+            '#title' => t('Advanced - Nodes that can be referenced (View)'),
+            '#collapsible' => TRUE,
+            '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
+            );
         if (count($views) > 1) {
-          $form['advanced']['advanced_view'] = array(
+            $form['advanced']['advanced_view'] = array(
             '#type' => 'select',
             '#title' => t('View used to select the nodes'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
             '#description' => t('<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
-          );
-          $form['advanced']['advanced_view_args'] = array(
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
+            );
+            $form['advanced']['advanced_view_args'] = array(
             '#type' => 'textfield',
             '#title' => t('View arguments'),
             '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
-          );
+            );
         }
         else {
-          $form['advanced']['no_view_help'] = array(
+            $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
-          );
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
+            );
         }
-      }
-      return $form;
+        }
+        return $form;
 
     case 'save':
       $settings = array('referenceable_types');
-      if (module_exists('views')) {
+        if (module_exists('views')) {
         $settings[] = 'advanced_view';
         $settings[] = 'advanced_view_args';
-      }
-      return $settings;
+        }
+        return $settings;
 
     case 'database columns':
       $columns = array(
         'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
-      );
-      return $columns;
+        );
+        return $columns;
 
     case 'views data':
       $data = content_views_field_views_data($field);
-      $db_info = content_database_info($field);
-      $table_alias = content_views_tablename($field);
+        $db_info = content_database_info($field);
+        $table_alias = content_views_tablename($field);
 
-      // Filter: swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
-      // Argument: use node.title for summaries.
-      $data["node_$table_alias"]['table']['join']['node'] = array(
+        // Filter: swap the handler to the 'in' operator.
+        $data[$table_alias][$field['field_name'] .'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+        // Argument: use node.title for summaries.
+        $data["node_$table_alias"]['table']['join']['node'] = array(
         'table' => 'node',
         'field' => 'nid',
         'left_table' => $table_alias,
         'left_field' => $field['field_name'] .'_nid',
-      );
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name table'] = "node_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name field'] = 'title';
-      // Relationship: add a relationship for related node.
-      $data[$table_alias][$field['field_name'] .'_nid']['relationship'] = array(
+        );
+        $data[$table_alias][$field['field_name'] .'_nid']['argument']['handler'] = 'content_handler_argument_reference';
+        $data[$table_alias][$field['field_name'] .'_nid']['argument']['name table'] = "node_$table_alias";
+        $data[$table_alias][$field['field_name'] .'_nid']['argument']['name field'] = 'title';
+        // Relationship: add a relationship for related node.
+        $data[$table_alias][$field['field_name'] .'_nid']['relationship'] = array(
         'base' => 'node',
         'field' => $db_info['columns']['nid']['column'],
         'handler' => 'content_handler_relationship',
         'label' => t($field['widget']['label']),
         'content_field_name' => $field['field_name'],
-      );
-      return $data;
-  }
+        );
+        return $data;
+    }
 }
 
 /**
  * Implementation of hook_field().
  */
 function nodereference_field($op, &$node, $field, &$items, $teaser, $page) {
-  static $sanitized_nodes = array();
+    static $sanitized_nodes = array();
   
-  switch ($op) {
+    switch ($op) {
     // When preparing a translation, load any translations of existing references.
     case 'prepare translation':
       $addition = array();
-      $addition[$field['field_name']] = array();
-      if (isset($node->translation_source->$field['field_name']) && is_array($node->translation_source->$field['field_name'])) {
+        $addition[$field['field_name']] = array();
+        if (isset($node->translation_source->$field['field_name']) && is_array($node->translation_source->$field['field_name'])) {
         foreach ($node->translation_source->$field['field_name'] as $key => $reference) {
-          $reference_node = node_load($reference['nid']);
-          // Test if the referenced node type is translatable and, if so,
-          // load translations if the reference is not for the current language.
-          // We can assume the translation module is present because it invokes 'prepare translation'.
-          if (translation_supported_type($reference_node->type) && !empty($reference_node->language) && $reference_node->language != $node->language && $translations = translation_node_get_translations($reference_node->tnid)) {
+            $reference_node = node_load($reference['nid']);
+            // Test if the referenced node type is translatable and, if so,
+            // load translations if the reference is not for the current language.
+            // We can assume the translation module is present because it invokes 'prepare translation'.
+            if (translation_supported_type($reference_node->type) && !empty($reference_node->language) && $reference_node->language != $node->language && $translations = translation_node_get_translations($reference_node->tnid)) {
             // If there is a translation for the current language, use it.
             $addition[$field['field_name']][] = array(
-              'nid' => isset($translations[$node->language]) ? $translations[$node->language]->nid : $reference['nid'],
+                'nid' => isset($translations[$node->language]) ? $translations[$node->language]->nid : $reference['nid'],
             );
-          }
+            }
+        }
         }
-      }
-      return $addition;
+        return $addition;
 
     case 'validate':
       // Extract nids to check.
       $ids = array();
-      foreach ($items as $delta => $item) {
+        foreach ($items as $delta => $item) {
         if (is_array($item) && !empty($item['nid'])) {
-          if (is_numeric($item['nid'])) {
+            if (is_numeric($item['nid'])) {
             $ids[] = $item['nid'];
-          }
-          else {
+            }
+            else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             form_set_error($error_element, t("%name: invalid input.", array('%name' => t($field['widget']['label']))));
-          }
+            }
+        }
         }
-      }
-      // Prevent performance hog if there are no ids to check.
-      if ($ids) {
+        // Prevent performance hog if there are no ids to check.
+        if ($ids) {
         $refs = _nodereference_potential_references($field, '', NULL, $ids);
         foreach ($items as $delta => $item) {
-          if (is_array($item)) {
+            if (is_array($item)) {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             if (!empty($item['nid']) && !isset($refs[$item['nid']])) {
-              form_set_error($error_element, t("%name: this post can't be referenced.", array('%name' => t($field['widget']['label']))));
+                form_set_error($error_element, t("%name: this post can't be referenced.", array('%name' => t($field['widget']['label']))));
             }
-          }
+            }
+        }
         }
-      }
-      return $items;
+        return $items;
 
     case 'sanitize':
       // We can't just check the node is 'referenceable', because Views-mode
@@ -241,133 +241,133 @@ 
 
       // Extract nids to check.
       $ids = array();
-      foreach ($items as $delta => $item) {
+        foreach ($items as $delta => $item) {
         if (is_array($item)) {
-          // Default to 'non accessible'.
-          $items[$delta]['safe'] = array();
-          if (!empty($item['nid']) && is_numeric($item['nid'])) {
+            // Default to 'non accessible'.
+            $items[$delta]['safe'] = array();
+            if (!empty($item['nid']) && is_numeric($item['nid'])) {
             $ids[] = $item['nid'];
-          }
+            }
+        }
         }
-      }
-      if ($ids) {
+        if ($ids) {
         // Load information about nids that we haven't already loaded during
         // this page request.
         $missing_ids = array_diff($ids, array_keys($sanitized_nodes));
         if (!empty($missing_ids)) {
-          $where = array('n.nid in ('. db_placeholders($missing_ids) . ')');
-          if (!user_access('administer nodes')) {
+            $where = array('n.nid in ('. db_placeholders($missing_ids) . ')');
+            if (!user_access('administer nodes')) {
             $where[] = 'n.status = 1';
-          }
-          $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '. implode(' AND ', $where)), $missing_ids);
-          while ($row = db_fetch_array($result)) {
+            }
+            $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '. implode(' AND ', $where)), $missing_ids);
+            while ($row = db_fetch_array($result)) {
             $sanitized_nodes[$row['nid']] = $row;
-          }
+            }
         }
         foreach ($items as $delta => $item) {
-          if (is_array($item) && !empty($item['nid']) && isset($sanitized_nodes[$item['nid']])) {
+            if (is_array($item) && !empty($item['nid']) && isset($sanitized_nodes[$item['nid']])) {
             $items[$delta]['safe'] = $sanitized_nodes[$item['nid']];
-          }
+            }
+        }
         }
-      }
-      return $items;
-  }
+        return $items;
+    }
 }
 
 /**
  * Implementation of hook_content_is_empty().
  */
 function nodereference_content_is_empty($item, $field) {
-  if (empty($item['nid'])) {
+    if (empty($item['nid'])) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Implementation of hook_field_formatter_info().
  */
 function nodereference_field_formatter_info() {
-  return array(
+    return array(
     'default' => array(
-      'label' => t('Title (link)'),
-      'field types' => array('nodereference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Title (link)'),
+        'field types' => array('nodereference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'plain' => array(
-      'label' => t('Title (no link)'),
-      'field types' => array('nodereference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Title (no link)'),
+        'field types' => array('nodereference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'full' => array(
-      'label' => t('Full node'),
-      'field types' => array('nodereference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Full node'),
+        'field types' => array('nodereference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'teaser' => array(
-      'label' => t('Teaser'),
-      'field types' => array('nodereference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Teaser'),
+        'field types' => array('nodereference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
-  );
+    );
 }
 
 /**
  * Theme function for 'default' nodereference field formatter.
  */
 function theme_nodereference_formatter_default($element) {
-  $output = '';
-  if (!empty($element['#item']['safe']['nid'])) {
+    $output = '';
+    if (!empty($element['#item']['safe']['nid'])) {
     $output = l($element['#item']['safe']['title'], 'node/'. $element['#item']['safe']['nid']);
     if (!$element['#item']['safe']['status']) {
-      $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
+        $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Theme function for 'plain' nodereference field formatter.
  */
 function theme_nodereference_formatter_plain($element) {
-  $output = '';
-  if (!empty($element['#item']['safe']['nid'])) {
+    $output = '';
+    if (!empty($element['#item']['safe']['nid'])) {
     $output = check_plain($element['#item']['safe']['title']);
     if (!$element['#item']['safe']['status']) {
-      $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
+        $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
+    }
     }
-  }
-  return $output;
+    return $output;
 }
 
 /**
  * Proxy theme function for 'full' and 'teaser' nodereference field formatters.
  */
 function theme_nodereference_formatter_full_teaser($element) {
-  static $recursion_queue = array();
-  $output = '';
-  if (!empty($element['#item']['safe']['nid'])) {
+    static $recursion_queue = array();
+    $output = '';
+    if (!empty($element['#item']['safe']['nid'])) {
     $nid = $element['#item']['safe']['nid'];
     $node = $element['#node'];
     $field = content_fields($element['#field_name'], $element['#type_name']);
     // If no 'referencing node' is set, we are starting a new 'reference thread'
     if (!isset($node->referencing_node)) {
-      $recursion_queue = array();
+        $recursion_queue = array();
     }
     $recursion_queue[] = $node->nid;
     if (in_array($nid, $recursion_queue)) {
-      // Prevent infinite recursion caused by reference cycles:
-      // if the node has already been rendered earlier in this 'thread',
-      // we fall back to 'default' (node title) formatter.
-      return theme('nodereference_formatter_default', $element);
+        // Prevent infinite recursion caused by reference cycles:
+        // if the node has already been rendered earlier in this 'thread',
+        // we fall back to 'default' (node title) formatter.
+        return theme('nodereference_formatter_default', $element);
     }
     if ($referenced_node = node_load($nid)) {
-      $referenced_node->referencing_node = $node;
-      $referenced_node->referencing_field = $field;
-      $output = node_view($referenced_node, $element['#formatter'] == 'teaser');
+        $referenced_node->referencing_node = $node;
+        $referenced_node->referencing_field = $field;
+        $output = node_view($referenced_node, $element['#formatter'] == 'teaser');
+    }
     }
-  }
-  return $output;
+    return $output;
 }
 
 /**
@@ -376,12 +376,12 @@ 
  * Store node titles collected in the curent request.
  */
 function _nodereference_titles($nid, $known_title = NULL) {
-  static $titles = array();
-  if (!isset($titles[$nid])) {
+    static $titles = array();
+    if (!isset($titles[$nid])) {
     $title = $known_title ? $known_title : db_result(db_query(db_rewrite_sql("SELECT n.title FROM {node} n WHERE n.nid=%d"), $nid));
     $titles[$nid] = $title ? $title : '';
-  }
-  return $titles[$nid];
+    }
+    return $titles[$nid];
 }
 
 /**
@@ -399,32 +399,32 @@ 
  * differently.
  */
 function nodereference_widget_info() {
-  return array(
+    return array(
     'nodereference_select' => array(
-      'label' => t('Select list'),
-      'field types' => array('nodereference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Select list'),
+        'field types' => array('nodereference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'nodereference_buttons' => array(
-      'label' => t('Check boxes/radio buttons'),
-      'field types' => array('nodereference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Check boxes/radio buttons'),
+        'field types' => array('nodereference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'nodereference_autocomplete' => array(
-      'label' => t('Autocomplete text field'),
-      'field types' => array('nodereference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array(
+        'label' => t('Autocomplete text field'),
+        'field types' => array('nodereference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -440,23 +440,23 @@ 
  * (see nodereference and userreference).
  */
 function nodereference_elements() {
-  return array(
+    return array(
     'nodereference_select' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('nodereference_select_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('nodereference_select_process'),
     ),
     'nodereference_buttons' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('nodereference_buttons_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('nodereference_buttons_process'),
     ),
     'nodereference_autocomplete' => array(
-      '#input' => TRUE,
-      '#columns' => array('name'), '#delta' => 0,
-      '#process' => array('nodereference_autocomplete_process'),
-      '#autocomplete_path' => FALSE,
-      ),
+        '#input' => TRUE,
+        '#columns' => array('name'), '#delta' => 0,
+        '#process' => array('nodereference_autocomplete_process'),
+        '#autocomplete_path' => FALSE,
+        ),
     );
 }
 
@@ -464,39 +464,39 @@ 
  * Implementation of hook_widget_settings().
  */
 function nodereference_widget_settings($op, $widget) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'nodereference_autocomplete') {
+        $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
+        $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+        if ($widget['type'] == 'nodereference_autocomplete') {
         $form['autocomplete_match'] = array(
-          '#type' => 'select',
-          '#title' => t('Autocomplete matching'),
-          '#default_value' => $match,
-          '#options' => array(
+            '#type' => 'select',
+            '#title' => t('Autocomplete matching'),
+            '#default_value' => $match,
+            '#options' => array(
             'starts_with' => t('Starts with'),
             'contains' => t('Contains'),
-          ),
-          '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of nodes.'),
+            ),
+            '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of nodes.'),
         );
         $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+            '#type' => 'textfield',
+            '#title' => t('Size of textfield'),
+            '#default_value' => $size,
+            '#element_validate' => array('_element_validate_integer_positive'),
+            '#required' => TRUE,
         );
-      }
-      else {
+        }
+        else {
         $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      return $form;
+        }
+        return $form;
 
     case 'save':
       return array('autocomplete_match', 'size');
-  }
+    }
 }
 
 /**
@@ -531,30 +531,30 @@ 
  *   the form item for a single element for this field
  */
 function nodereference_widget(&$form, &$form_state, $field, $items, $delta = 0) {
-  switch ($field['widget']['type']) {
+    switch ($field['widget']['type']) {
     case 'nodereference_select':
       $element = array(
         '#type' => 'nodereference_select',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'nodereference_buttons':
       $element = array(
         '#type' => 'nodereference_buttons',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'nodereference_autocomplete':
       $element = array(
         '#type' => 'nodereference_autocomplete',
         '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
         '#value_callback' => 'nodereference_autocomplete_value',
-      );
-      break;
-  }
-  return $element;
+        );
+        break;
+    }
+    return $element;
 }
 
 /**
@@ -563,14 +563,14 @@ 
  * Substitute in the node title for the node nid.
  */
 function nodereference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
-  if (!empty($element['#default_value'][$field_key])) {
+    $field_key  = $element['#columns'][0];
+    if (!empty($element['#default_value'][$field_key])) {
     $nid = $element['#default_value'][$field_key];
     $value = db_result(db_query(db_rewrite_sql('SELECT n.title FROM {node} n WHERE n.nid = %d'), $nid));
     $value .= ' [nid:'. $nid .']';
     return array($field_key => $value);
-  }
-  return array($field_key => NULL);
+    }
+    return array($field_key => NULL);
 }
 
 /**
@@ -582,12 +582,12 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function nodereference_select_process($element, $edit, $form_state, $form) {
-  // The nodereference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // This will create a new, nested instance of the field.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The nodereference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // This will create a new, nested instance of the field.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_select',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -599,12 +599,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'nodereference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'nodereference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -616,12 +616,12 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function nodereference_buttons_process($element, $edit, $form_state, $form) {
-  // The nodereference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // This will create a new, nested instance of the field.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The nodereference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // This will create a new, nested instance of the field.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_buttons',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -633,12 +633,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'nodereference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'nodereference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -650,13 +650,13 @@ 
  */
 function nodereference_autocomplete_process($element, $edit, $form_state, $form) {
 
-  // The nodereference autocomplete widget doesn't need to create its own
-  // element, it can wrap around the text_textfield element and add an autocomplete
-  // path and some extra processing to it.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+    // The nodereference autocomplete widget doesn't need to create its own
+    // element, it can wrap around the text_textfield element and add an autocomplete
+    // path and some extra processing to it.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
 
-  $element[$field_key] = array(
+    $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     '#autocomplete_path' => 'nodereference/autocomplete/'. $element['#field_name'],
@@ -669,20 +669,20 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'nodereference_autocomplete_validate');
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'nodereference_autocomplete_validate');
 
-  // Used so that hook_field('validate') knows where to flag an error.
-  $element['_error_element'] = array(
+    // Used so that hook_field('validate') knows where to flag an error.
+    $element['_error_element'] = array(
     '#type' => 'value',
     // Wrapping the element around a text_textfield element creates a
     // nested element, so the final id will look like 'field-name-0-nid-nid'.
     '#value' => implode('][', array_merge($element['#parents'], array($field_key, $field_key))),
-  );
-  return $element;
+    );
+    return $element;
 }
 
 /**
@@ -697,20 +697,20 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function nodereference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+    $field_key  = $element['#columns'][0];
 
-  $value = $form_state['values'];
-  $new_parents = array();
-  foreach ($element['#parents'] as $parent) {
+    $value = $form_state['values'];
+    $new_parents = array();
+    foreach ($element['#parents'] as $parent) {
     $value = $value[$parent];
     // Use === to be sure we get right results if parent is a zero (delta) value.
     if ($parent === $field_key) {
-      $element['#parents'] = $new_parents;
-      form_set_value($element, $value, $form_state);
-      break;
+        $element['#parents'] = $new_parents;
+        form_set_value($element, $value, $form_state);
+        break;
     }
     $new_parents[] = $parent;
-  }
+    }
 }
 
 /**
@@ -721,52 +721,52 @@ 
  * back to its original location, 'field-name-0-nid'.
  */
 function nodereference_autocomplete_validate($element, &$form_state) {
-  $field_name = $element['#field_name'];
-  $type_name = $element['#type_name'];
-  $field = content_fields($field_name, $type_name);
-  $field_key  = $element['#columns'][0];
-  $delta = $element['#delta'];
-  $value = $element['#value'][$field_key];
-  $nid = NULL;
-  if (!empty($value)) {
+    $field_name = $element['#field_name'];
+    $type_name = $element['#type_name'];
+    $field = content_fields($field_name, $type_name);
+    $field_key  = $element['#columns'][0];
+    $delta = $element['#delta'];
+    $value = $element['#value'][$field_key];
+    $nid = NULL;
+    if (!empty($value)) {
     preg_match('/^(?:\s*|(.*) )?\[\s*nid\s*:\s*(\d+)\s*\]$/', $value, $matches);
     if (!empty($matches)) {
-      // Explicit [nid:n].
-      list(, $title, $nid) = $matches;
-      if (!empty($title) && ($n = node_load($nid)) && trim($title) != trim($n->title)) {
+        // Explicit [nid:n].
+        list(, $title, $nid) = $matches;
+        if (!empty($title) && ($n = node_load($nid)) && trim($title) != trim($n->title)) {
         form_error($element[$field_key], t('%name: title mismatch. Please check your selection.', array('%name' => t($field['widget']['label']))));
-      }
+        }
     }
     else {
-      // No explicit nid.
-      $reference = _nodereference_potential_references($field, $value, 'equals', NULL, 1);
-      if (empty($reference)) {
+        // No explicit nid.
+        $reference = _nodereference_potential_references($field, $value, 'equals', NULL, 1);
+        if (empty($reference)) {
         form_error($element[$field_key], t('%name: found no valid post with that title.', array('%name' => t($field['widget']['label']))));
-      }
-      else {
+        }
+        else {
         // TODO:
         // the best thing would be to present the user with an additional form,
         // allowing the user to choose between valid candidates with the same title
         // ATM, we pick the first matching candidate...
         $nid = key($reference);
-      }
+        }
     }
-  }
-  form_set_value($element, $nid, $form_state);
+    }
+    form_set_value($element, $nid, $form_state);
 }
 
 /**
  * Implementation of hook_allowed_values().
  */
 function nodereference_allowed_values($field) {
-  $references = _nodereference_potential_references($field);
+    $references = _nodereference_potential_references($field);
 
-  $options = array();
-  foreach ($references as $key => $value) {
+    $options = array();
+    foreach ($references as $key => $value) {
     $options[$key] = $value['rendered'];
-  }
+    }
 
-  return $options;
+    return $options;
 }
 
 /**
@@ -802,26 +802,26 @@ 
  *   )
  */
 function _nodereference_potential_references($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  static $results = array();
+    static $results = array();
 
-  // Create unique id for static cache.
-  $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
-  if (!isset($results[$cid])) {
+    // Create unique id for static cache.
+    $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
+    if (!isset($results[$cid])) {
     $references = FALSE;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
-      $references = _nodereference_potential_references_views($field, $string, $match, $ids, $limit);
+        $references = _nodereference_potential_references_views($field, $string, $match, $ids, $limit);
     }
     // If the view doesn't exist, we got FALSE, and fallback to the regular 'standard mode'.
 
     if ($references === FALSE) {
-      $references = _nodereference_potential_references_standard($field, $string, $match, $ids, $limit);
+        $references = _nodereference_potential_references_standard($field, $string, $match, $ids, $limit);
     }
 
     // Store the results.
     $results[$cid] = !empty($references) ? $references : array();
-  }
+    }
 
-  return $results[$cid];
+    return $results[$cid];
 }
 
 /**
@@ -829,9 +829,9 @@ 
  * case of Views-defined referenceable nodes.
  */
 function _nodereference_potential_references_views($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $view_name = $field['advanced_view'];
+    $view_name = $field['advanced_view'];
 
-  if ($view = views_get_view($view_name)) {
+    if ($view = views_get_view($view_name)) {
     // We add a display, and let it derive from the 'default' display.
     // TODO: We should let the user pick a display in the fields settings - sort of requires AHAH...
     $display = $view->add_display('content_references');
@@ -848,12 +848,12 @@ 
     // Additional options to let content_plugin_display_references::query()
     // narrow the results.
     $options = array(
-      'table' => 'node',
-      'field_string' => 'title',
-      'string' => $string,
-      'match' => $match,
-      'field_id' => 'nid',
-      'ids' => $ids,
+        'table' => 'node',
+        'field_string' => 'title',
+        'string' => $string,
+        'match' => $match,
+        'field_id' => 'nid',
+        'ids' => $ids,
     );
     $view->display_handler->set_option('content_options', $options);
 
@@ -866,26 +866,26 @@ 
 
     // Get arguments for the view.
     if (!empty($field['advanced_view_args'])) {
-      // TODO: Support Tokens using token.module ?
-      $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
+        // TODO: Support Tokens using token.module ?
+        $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
     }
     else {
-      $view_args = array();
+        $view_args = array();
     }
 
     // We do need title field, so add it if not present (unlikely, but...)
     $fields = $view->get_items('field', $display);
     if (!isset($fields['title'])) {
-      $view->add_item($display, 'field', 'node', 'title');
+        $view->add_item($display, 'field', 'node', 'title');
     }
 
     // If not set, make all fields inline and define a separator.
     $options = $view->display_handler->get_option('row_options');
     if (empty($options['inline'])) {
-      $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
+        $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
     }
     if (empty($options['separator'])) {
-      $options['separator'] = '-';
+        $options['separator'] = '-';
     }
     $view->display_handler->set_option('row_options', $options);
 
@@ -894,12 +894,12 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+    }
+    else {
     $result = FALSE;
-  }
+    }
 
-  return $result;
+    return $result;
 }
 
 /**
@@ -907,50 +907,50 @@ 
  * referenceable nodes defined by content types.
  */
 function _nodereference_potential_references_standard($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $related_types = array();
-  $where = array();
-  $args = array();
+    $related_types = array();
+    $where = array();
+    $args = array();
 
-  if (is_array($field['referenceable_types'])) {
+    if (is_array($field['referenceable_types'])) {
     foreach (array_filter($field['referenceable_types']) as $related_type) {
-      $related_types[] = "n.type = '%s'";
-      $args[] = $related_type;
+        $related_types[] = "n.type = '%s'";
+        $args[] = $related_type;
+    }
     }
-  }
 
-  $where[] = implode(' OR ', $related_types);
+    $where[] = implode(' OR ', $related_types);
 
-  if (!count($related_types)) {
+    if (!count($related_types)) {
     return array();
-  }
+    }
 
-  if ($string !== '') {
+    if ($string !== '') {
     $like = $GLOBALS["db_type"] == 'pgsql' ? "ILIKE" : "LIKE";
     $match_clauses = array(
-      'contains' => "$like '%%%s%%'",
-      'equals' => "= '%s'",
-      'starts_with' => "$like '%s%%'",
+        'contains' => "$like '%%%s%%'",
+        'equals' => "= '%s'",
+        'starts_with' => "$like '%s%%'",
     );
     $where[] = 'n.title '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+    }
+    elseif ($ids) {
     $where[] = 'n.nid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
-  }
+    }
 
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
-  $sql = db_rewrite_sql("SELECT n.nid, n.title AS node_title, n.type AS node_type FROM {node} n $where_clause ORDER BY n.title, n.type");
-  $result = $limit ? db_query_range($sql, $args, 0, $limit) : db_query($sql, $args);
-  $references = array();
-  while ($node = db_fetch_object($result)) {
+    $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
+    $sql = db_rewrite_sql("SELECT n.nid, n.title AS node_title, n.type AS node_type FROM {node} n $where_clause ORDER BY n.title, n.type");
+    $result = $limit ? db_query_range($sql, $args, 0, $limit) : db_query($sql, $args);
+    $references = array();
+    while ($node = db_fetch_object($result)) {
     $references[$node->nid] = array(
-      'title' => $node->node_title,
-      'rendered' => check_plain($node->node_title),
+        'title' => $node->node_title,
+        'rendered' => check_plain($node->node_title),
     );
-  }
+    }
 
-  return $references;
+    return $references;
 }
 
 /**
@@ -960,31 +960,31 @@ 
  * a user has edit but not view access.
  */
 function nodereference_autocomplete_access($field_name) {
-  return user_access('access content') && ($field = content_fields($field_name)) && isset($field['field_name']) && content_access('view', $field) && content_access('edit', $field);
+    return user_access('access content') && ($field = content_fields($field_name)) && isset($field['field_name']) && content_access('view', $field) && content_access('edit', $field);
 }
 
 /**
  * Menu callback; Retrieve a pipe delimited string of autocomplete suggestions for existing users
  */
 function nodereference_autocomplete($field_name, $string = '') {
-  $fields = content_fields();
-  $field = $fields[$field_name];
-  $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
-  $matches = array();
+    $fields = content_fields();
+    $field = $fields[$field_name];
+    $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
+    $matches = array();
 
-  $references = _nodereference_potential_references($field, $string, $match, array(), 10);
-  foreach ($references as $id => $row) {
+    $references = _nodereference_potential_references($field, $string, $match, array(), 10);
+    foreach ($references as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
     $matches[$row['title'] ." [nid:$id]"] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
-  }
-  drupal_json($matches);
+    }
+    drupal_json($matches);
 }
 
 /**
  * Implementation of hook_node_types.
  */
 function nodereference_node_type($op, $info) {
-  switch ($op) {
+    switch ($op) {
     case 'update':
       // Reflect type name changes to the 'referenceable types' settings.
       if (!empty($info->old_type) && $info->old_type != $info->type) {
@@ -993,22 +993,22 @@ 
         $fields = content_fields();
         $rebuild = FALSE;
         foreach ($fields as $field_name => $field) {
-          if ($field['type'] == 'nodereference' && isset($field['referenceable_types'][$info->old_type])) {
+            if ($field['type'] == 'nodereference' && isset($field['referenceable_types'][$info->old_type])) {
             $field['referenceable_types'][$info->type] = empty($field['referenceable_types'][$info->old_type]) ? 0 : $info->type;
             unset($field['referenceable_types'][$info->old_type]);
             content_field_instance_update($field, FALSE);
             $rebuild = TRUE;
-          }
+            }
         }
 
         // Clear caches and rebuild menu only if any field has been updated.
         if ($rebuild) {
-          content_clear_type_cache(TRUE);
-          menu_rebuild();
+            content_clear_type_cache(TRUE);
+            menu_rebuild();
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -1018,16 +1018,16 @@ 
  * nodereference field with the 'full node' / 'teaser' formatters.
  */
 function nodereference_preprocess_node(&$vars) {
-  // The 'referencing_field' attribute of the node is added by the 'teaser'
-  // and 'full node' formatters.
-  if (!empty($vars['node']->referencing_field)) {
+    // The 'referencing_field' attribute of the node is added by the 'teaser'
+    // and 'full node' formatters.
+    if (!empty($vars['node']->referencing_field)) {
     $node = $vars['node'];
     $field = $node->referencing_field;
     $vars['template_files'][] = 'node-nodereference';
     $vars['template_files'][] = 'node-nodereference-'. $field['field_name'];
     $vars['template_files'][] = 'node-nodereference-'. $node->type;
     $vars['template_files'][] = 'node-nodereference-'. $field['field_name'] .'-'. $node->type;
-  }
+    }
 }
 
 /**
@@ -1042,13 +1042,13 @@ 
  * $element['#delta]  is the position of this element in the group
  */
 function theme_nodereference_select($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_nodereference_buttons($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_nodereference_autocomplete($element) {
-  return $element['#children'];
+    return $element['#children'];
 }

Switch Indentation +231 added lines, -231 removed lines

@@ -79,102 +79,102 @@ 
  */
 function nodereference_field_settings($op, $field) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $form['referenceable_types'] = array(
-        '#type' => 'checkboxes',
-        '#title' => t('Content types that can be referenced'),
-        '#multiple' => TRUE,
-        '#default_value' => is_array($field['referenceable_types']) ? $field['referenceable_types'] : array(),
-        '#options' => array_map('check_plain', node_get_types('names')),
-      );
-      if (module_exists('views')) {
-        $views = array('--' => '--');
-        $all_views = views_get_all_views();
-        foreach ($all_views as $view) {
-          // Only 'node' views that have fields will work for our purpose.
-          if ($view->base_table == 'node' && !empty($view->display['default']->display_options['fields'])) {
-            if ($view->type == 'Default') {
-              $views[t('Default Views')][$view->name] = $view->name;
-            }
-            else {
-              $views[t('Existing Views')][$view->name] = $view->name;
-            }
+  case 'form':
+    $form = array();
+    $form['referenceable_types'] = array(
+      '#type' => 'checkboxes',
+      '#title' => t('Content types that can be referenced'),
+      '#multiple' => TRUE,
+      '#default_value' => is_array($field['referenceable_types']) ? $field['referenceable_types'] : array(),
+      '#options' => array_map('check_plain', node_get_types('names')),
+    );
+    if (module_exists('views')) {
+      $views = array('--' => '--');
+      $all_views = views_get_all_views();
+      foreach ($all_views as $view) {
+        // Only 'node' views that have fields will work for our purpose.
+        if ($view->base_table == 'node' && !empty($view->display['default']->display_options['fields'])) {
+          if ($view->type == 'Default') {
+            $views[t('Default Views')][$view->name] = $view->name;
+          }
+          else {
+            $views[t('Existing Views')][$view->name] = $view->name;
           }
-        }
-
-        $form['advanced'] = array(
-           '#type' => 'fieldset',
-           '#title' => t('Advanced - Nodes that can be referenced (View)'),
-           '#collapsible' => TRUE,
-           '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
-         );
-        if (count($views) > 1) {
-          $form['advanced']['advanced_view'] = array(
-            '#type' => 'select',
-            '#title' => t('View used to select the nodes'),
-            '#options' => $views,
-            '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
-            '#description' => t('<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
-          );
-          $form['advanced']['advanced_view_args'] = array(
-            '#type' => 'textfield',
-            '#title' => t('View arguments'),
-            '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
-            '#required' => FALSE,
-            '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
-          );
-        }
-        else {
-          $form['advanced']['no_view_help'] = array(
-            '#value' => t('<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
-          );
         }
       }
-      return $form;
 
-    case 'save':
-      $settings = array('referenceable_types');
-      if (module_exists('views')) {
-        $settings[] = 'advanced_view';
-        $settings[] = 'advanced_view_args';
+      $form['advanced'] = array(
+         '#type' => 'fieldset',
+         '#title' => t('Advanced - Nodes that can be referenced (View)'),
+         '#collapsible' => TRUE,
+         '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
+       );
+      if (count($views) > 1) {
+        $form['advanced']['advanced_view'] = array(
+          '#type' => 'select',
+          '#title' => t('View used to select the nodes'),
+          '#options' => $views,
+          '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
+          '#description' => t('<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>') .
+            t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
+        );
+        $form['advanced']['advanced_view_args'] = array(
+          '#type' => 'textfield',
+          '#title' => t('View arguments'),
+          '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
+          '#required' => FALSE,
+          '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
+        );
+      }
+      else {
+        $form['advanced']['no_view_help'] = array(
+          '#value' => t('<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
+            t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
+        );
       }
-      return $settings;
+    }
+    return $form;
 
-    case 'database columns':
-      $columns = array(
-        'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
-      );
-      return $columns;
-
-    case 'views data':
-      $data = content_views_field_views_data($field);
-      $db_info = content_database_info($field);
-      $table_alias = content_views_tablename($field);
-
-      // Filter: swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
-      // Argument: use node.title for summaries.
-      $data["node_$table_alias"]['table']['join']['node'] = array(
-        'table' => 'node',
-        'field' => 'nid',
-        'left_table' => $table_alias,
-        'left_field' => $field['field_name'] .'_nid',
-      );
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name table'] = "node_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name field'] = 'title';
-      // Relationship: add a relationship for related node.
-      $data[$table_alias][$field['field_name'] .'_nid']['relationship'] = array(
-        'base' => 'node',
-        'field' => $db_info['columns']['nid']['column'],
-        'handler' => 'content_handler_relationship',
-        'label' => t($field['widget']['label']),
-        'content_field_name' => $field['field_name'],
-      );
-      return $data;
+  case 'save':
+    $settings = array('referenceable_types');
+    if (module_exists('views')) {
+      $settings[] = 'advanced_view';
+      $settings[] = 'advanced_view_args';
+    }
+    return $settings;
+
+  case 'database columns':
+    $columns = array(
+      'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
+    );
+    return $columns;
+
+  case 'views data':
+    $data = content_views_field_views_data($field);
+    $db_info = content_database_info($field);
+    $table_alias = content_views_tablename($field);
+
+    // Filter: swap the handler to the 'in' operator.
+    $data[$table_alias][$field['field_name'] .'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+    // Argument: use node.title for summaries.
+    $data["node_$table_alias"]['table']['join']['node'] = array(
+      'table' => 'node',
+      'field' => 'nid',
+      'left_table' => $table_alias,
+      'left_field' => $field['field_name'] .'_nid',
+    );
+    $data[$table_alias][$field['field_name'] .'_nid']['argument']['handler'] = 'content_handler_argument_reference';
+    $data[$table_alias][$field['field_name'] .'_nid']['argument']['name table'] = "node_$table_alias";
+    $data[$table_alias][$field['field_name'] .'_nid']['argument']['name field'] = 'title';
+    // Relationship: add a relationship for related node.
+    $data[$table_alias][$field['field_name'] .'_nid']['relationship'] = array(
+      'base' => 'node',
+      'field' => $db_info['columns']['nid']['column'],
+      'handler' => 'content_handler_relationship',
+      'label' => t($field['widget']['label']),
+      'content_field_name' => $field['field_name'],
+    );
+    return $data;
   }
 }
 
@@ -186,91 +186,91 @@ 
   
   switch ($op) {
     // When preparing a translation, load any translations of existing references.
-    case 'prepare translation':
-      $addition = array();
-      $addition[$field['field_name']] = array();
-      if (isset($node->translation_source->$field['field_name']) && is_array($node->translation_source->$field['field_name'])) {
-        foreach ($node->translation_source->$field['field_name'] as $key => $reference) {
-          $reference_node = node_load($reference['nid']);
-          // Test if the referenced node type is translatable and, if so,
-          // load translations if the reference is not for the current language.
-          // We can assume the translation module is present because it invokes 'prepare translation'.
-          if (translation_supported_type($reference_node->type) && !empty($reference_node->language) && $reference_node->language != $node->language && $translations = translation_node_get_translations($reference_node->tnid)) {
-            // If there is a translation for the current language, use it.
-            $addition[$field['field_name']][] = array(
-              'nid' => isset($translations[$node->language]) ? $translations[$node->language]->nid : $reference['nid'],
-            );
-          }
+  case 'prepare translation':
+    $addition = array();
+    $addition[$field['field_name']] = array();
+    if (isset($node->translation_source->$field['field_name']) && is_array($node->translation_source->$field['field_name'])) {
+      foreach ($node->translation_source->$field['field_name'] as $key => $reference) {
+        $reference_node = node_load($reference['nid']);
+        // Test if the referenced node type is translatable and, if so,
+        // load translations if the reference is not for the current language.
+        // We can assume the translation module is present because it invokes 'prepare translation'.
+        if (translation_supported_type($reference_node->type) && !empty($reference_node->language) && $reference_node->language != $node->language && $translations = translation_node_get_translations($reference_node->tnid)) {
+          // If there is a translation for the current language, use it.
+          $addition[$field['field_name']][] = array(
+            'nid' => isset($translations[$node->language]) ? $translations[$node->language]->nid : $reference['nid'],
+          );
         }
       }
-      return $addition;
-
-    case 'validate':
-      // Extract nids to check.
-      $ids = array();
-      foreach ($items as $delta => $item) {
-        if (is_array($item) && !empty($item['nid'])) {
-          if (is_numeric($item['nid'])) {
-            $ids[] = $item['nid'];
-          }
-          else {
-            $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-            form_set_error($error_element, t("%name: invalid input.", array('%name' => t($field['widget']['label']))));
-          }
+    }
+    return $addition;
+
+  case 'validate':
+    // Extract nids to check.
+    $ids = array();
+    foreach ($items as $delta => $item) {
+      if (is_array($item) && !empty($item['nid'])) {
+        if (is_numeric($item['nid'])) {
+          $ids[] = $item['nid'];
         }
-      }
-      // Prevent performance hog if there are no ids to check.
-      if ($ids) {
-        $refs = _nodereference_potential_references($field, '', NULL, $ids);
-        foreach ($items as $delta => $item) {
-          if (is_array($item)) {
-            $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-            if (!empty($item['nid']) && !isset($refs[$item['nid']])) {
-              form_set_error($error_element, t("%name: this post can't be referenced.", array('%name' => t($field['widget']['label']))));
-            }
-          }
+        else {
+          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+          form_set_error($error_element, t("%name: invalid input.", array('%name' => t($field['widget']['label']))));
         }
       }
-      return $items;
-
-    case 'sanitize':
-      // We can't just check the node is 'referenceable', because Views-mode
-      // could rely on 'current user' (at edit time).
-
-      // Extract nids to check.
-      $ids = array();
+    }
+    // Prevent performance hog if there are no ids to check.
+    if ($ids) {
+      $refs = _nodereference_potential_references($field, '', NULL, $ids);
       foreach ($items as $delta => $item) {
         if (is_array($item)) {
-          // Default to 'non accessible'.
-          $items[$delta]['safe'] = array();
-          if (!empty($item['nid']) && is_numeric($item['nid'])) {
-            $ids[] = $item['nid'];
+          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+          if (!empty($item['nid']) && !isset($refs[$item['nid']])) {
+            form_set_error($error_element, t("%name: this post can't be referenced.", array('%name' => t($field['widget']['label']))));
           }
         }
       }
-      if ($ids) {
-        // Load information about nids that we haven't already loaded during
-        // this page request.
-        $missing_ids = array_diff($ids, array_keys($sanitized_nodes));
-        if (!empty($missing_ids)) {
-          $where = array('n.nid in ('. db_placeholders($missing_ids) . ')');
-          if (!user_access('administer nodes')) {
-            $where[] = 'n.status = 1';
-          }
-          $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '. implode(' AND ', $where)), $missing_ids);
-          while ($row = db_fetch_array($result)) {
-            $sanitized_nodes[$row['nid']] = $row;
-          }
+    }
+    return $items;
+
+  case 'sanitize':
+    // We can't just check the node is 'referenceable', because Views-mode
+    // could rely on 'current user' (at edit time).
+
+    // Extract nids to check.
+    $ids = array();
+    foreach ($items as $delta => $item) {
+      if (is_array($item)) {
+        // Default to 'non accessible'.
+        $items[$delta]['safe'] = array();
+        if (!empty($item['nid']) && is_numeric($item['nid'])) {
+          $ids[] = $item['nid'];
         }
-        foreach ($items as $delta => $item) {
-          if (is_array($item) && !empty($item['nid']) && isset($sanitized_nodes[$item['nid']])) {
-            $items[$delta]['safe'] = $sanitized_nodes[$item['nid']];
-          }
+      }
+    }
+    if ($ids) {
+      // Load information about nids that we haven't already loaded during
+      // this page request.
+      $missing_ids = array_diff($ids, array_keys($sanitized_nodes));
+      if (!empty($missing_ids)) {
+        $where = array('n.nid in ('. db_placeholders($missing_ids) . ')');
+        if (!user_access('administer nodes')) {
+          $where[] = 'n.status = 1';
+        }
+        $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '. implode(' AND ', $where)), $missing_ids);
+        while ($row = db_fetch_array($result)) {
+          $sanitized_nodes[$row['nid']] = $row;
         }
       }
-      return $items;
+      foreach ($items as $delta => $item) {
+        if (is_array($item) && !empty($item['nid']) && isset($sanitized_nodes[$item['nid']])) {
+          $items[$delta]['safe'] = $sanitized_nodes[$item['nid']];
+        }
+      }
+    }
+    return $items;
   }
 }
 
@@ -465,37 +465,37 @@ 
  */
 function nodereference_widget_settings($op, $widget) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'nodereference_autocomplete') {
-        $form['autocomplete_match'] = array(
-          '#type' => 'select',
-          '#title' => t('Autocomplete matching'),
-          '#default_value' => $match,
-          '#options' => array(
-            'starts_with' => t('Starts with'),
-            'contains' => t('Contains'),
-          ),
-          '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of nodes.'),
-        );
-        $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
-        );
-      }
-      else {
-        $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
-        $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      return $form;
+  case 'form':
+    $form = array();
+    $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
+    $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+    if ($widget['type'] == 'nodereference_autocomplete') {
+      $form['autocomplete_match'] = array(
+        '#type' => 'select',
+        '#title' => t('Autocomplete matching'),
+        '#default_value' => $match,
+        '#options' => array(
+          'starts_with' => t('Starts with'),
+          'contains' => t('Contains'),
+        ),
+        '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of nodes.'),
+      );
+      $form['size'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Size of textfield'),
+        '#default_value' => $size,
+        '#element_validate' => array('_element_validate_integer_positive'),
+        '#required' => TRUE,
+      );
+    }
+    else {
+      $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
+      $form['size'] = array('#type' => 'hidden', '#value' => $size);
+    }
+    return $form;
 
-    case 'save':
-      return array('autocomplete_match', 'size');
+  case 'save':
+    return array('autocomplete_match', 'size');
   }
 }
 
@@ -532,27 +532,27 @@ 
  */
 function nodereference_widget(&$form, &$form_state, $field, $items, $delta = 0) {
   switch ($field['widget']['type']) {
-    case 'nodereference_select':
-      $element = array(
-        '#type' => 'nodereference_select',
-        '#default_value' => $items,
-      );
-      break;
+  case 'nodereference_select':
+    $element = array(
+      '#type' => 'nodereference_select',
+      '#default_value' => $items,
+    );
+    break;
 
-    case 'nodereference_buttons':
-      $element = array(
-        '#type' => 'nodereference_buttons',
-        '#default_value' => $items,
-      );
-      break;
+  case 'nodereference_buttons':
+    $element = array(
+      '#type' => 'nodereference_buttons',
+      '#default_value' => $items,
+    );
+    break;
 
-    case 'nodereference_autocomplete':
-      $element = array(
-        '#type' => 'nodereference_autocomplete',
-        '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
-        '#value_callback' => 'nodereference_autocomplete_value',
-      );
-      break;
+  case 'nodereference_autocomplete':
+    $element = array(
+      '#type' => 'nodereference_autocomplete',
+      '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
+      '#value_callback' => 'nodereference_autocomplete_value',
+    );
+    break;
   }
   return $element;
 }
@@ -985,29 +985,29 @@ 
  */
 function nodereference_node_type($op, $info) {
   switch ($op) {
-    case 'update':
-      // Reflect type name changes to the 'referenceable types' settings.
-      if (!empty($info->old_type) && $info->old_type != $info->type) {
-        // content.module's implementaion of hook_node_type() has already
-        // refreshed _content_type_info().
-        $fields = content_fields();
-        $rebuild = FALSE;
-        foreach ($fields as $field_name => $field) {
-          if ($field['type'] == 'nodereference' && isset($field['referenceable_types'][$info->old_type])) {
-            $field['referenceable_types'][$info->type] = empty($field['referenceable_types'][$info->old_type]) ? 0 : $info->type;
-            unset($field['referenceable_types'][$info->old_type]);
-            content_field_instance_update($field, FALSE);
-            $rebuild = TRUE;
-          }
+  case 'update':
+    // Reflect type name changes to the 'referenceable types' settings.
+    if (!empty($info->old_type) && $info->old_type != $info->type) {
+      // content.module's implementaion of hook_node_type() has already
+      // refreshed _content_type_info().
+      $fields = content_fields();
+      $rebuild = FALSE;
+      foreach ($fields as $field_name => $field) {
+        if ($field['type'] == 'nodereference' && isset($field['referenceable_types'][$info->old_type])) {
+          $field['referenceable_types'][$info->type] = empty($field['referenceable_types'][$info->old_type]) ? 0 : $info->type;
+          unset($field['referenceable_types'][$info->old_type]);
+          content_field_instance_update($field, FALSE);
+          $rebuild = TRUE;
         }
+      }
 
-        // Clear caches and rebuild menu only if any field has been updated.
-        if ($rebuild) {
-          content_clear_type_cache(TRUE);
-          menu_rebuild();
-        }
+      // Clear caches and rebuild menu only if any field has been updated.
+      if ($rebuild) {
+        content_clear_type_cache(TRUE);
+        menu_rebuild();
       }
-      break;
+    }
+    break;
   }
 }
 

Spacing +29 added lines, -29 removed lines

@@ -57,7 +57,7 @@ 
  */
 function nodereference_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'relationships') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -115,7 +115,7 @@ 
             '#title' => t('View used to select the nodes'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
-            '#description' => t('<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>') .
+            '#description' => t('<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>').
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
           );
           $form['advanced']['advanced_view_args'] = array(
@@ -128,7 +128,7 @@ 
         }
         else {
           $form['advanced']['no_view_help'] = array(
-            '#value' => t('<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
+            '#value' => t('<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>').
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
           );
         }
@@ -155,19 +155,19 @@ 
       $table_alias = content_views_tablename($field);
 
       // Filter: swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+      $data[$table_alias][$field['field_name'].'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
       // Argument: use node.title for summaries.
       $data["node_$table_alias"]['table']['join']['node'] = array(
         'table' => 'node',
         'field' => 'nid',
         'left_table' => $table_alias,
-        'left_field' => $field['field_name'] .'_nid',
+        'left_field' => $field['field_name'].'_nid',
       );
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name table'] = "node_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name field'] = 'title';
+      $data[$table_alias][$field['field_name'].'_nid']['argument']['handler'] = 'content_handler_argument_reference';
+      $data[$table_alias][$field['field_name'].'_nid']['argument']['name table'] = "node_$table_alias";
+      $data[$table_alias][$field['field_name'].'_nid']['argument']['name field'] = 'title';
       // Relationship: add a relationship for related node.
-      $data[$table_alias][$field['field_name'] .'_nid']['relationship'] = array(
+      $data[$table_alias][$field['field_name'].'_nid']['relationship'] = array(
         'base' => 'node',
         'field' => $db_info['columns']['nid']['column'],
         'handler' => 'content_handler_relationship',
@@ -255,11 +255,11 @@ 
         // this page request.
         $missing_ids = array_diff($ids, array_keys($sanitized_nodes));
         if (!empty($missing_ids)) {
-          $where = array('n.nid in ('. db_placeholders($missing_ids) . ')');
+          $where = array('n.nid in ('.db_placeholders($missing_ids).')');
           if (!user_access('administer nodes')) {
             $where[] = 'n.status = 1';
           }
-          $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '. implode(' AND ', $where)), $missing_ids);
+          $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '.implode(' AND ', $where)), $missing_ids);
           while ($row = db_fetch_array($result)) {
             $sanitized_nodes[$row['nid']] = $row;
           }
@@ -318,9 +318,9 @@ 
 function theme_nodereference_formatter_default($element) {
   $output = '';
   if (!empty($element['#item']['safe']['nid'])) {
-    $output = l($element['#item']['safe']['title'], 'node/'. $element['#item']['safe']['nid']);
+    $output = l($element['#item']['safe']['title'], 'node/'.$element['#item']['safe']['nid']);
     if (!$element['#item']['safe']['status']) {
-      $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
+      $output = '<span class="node-unpublished"> '.t('(Unpublished)')." $output</span>";
     }
   }
   return $output;
@@ -334,7 +334,7 @@ 
   if (!empty($element['#item']['safe']['nid'])) {
     $output = check_plain($element['#item']['safe']['title']);
     if (!$element['#item']['safe']['status']) {
-      $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
+      $output = '<span class="node-unpublished"> '.t('(Unpublished)')." $output</span>";
     }
   }
   return $output;
@@ -563,11 +563,11 @@ 
  * Substitute in the node title for the node nid.
  */
 function nodereference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   if (!empty($element['#default_value'][$field_key])) {
     $nid = $element['#default_value'][$field_key];
     $value = db_result(db_query(db_rewrite_sql('SELECT n.title FROM {node} n WHERE n.nid = %d'), $nid));
-    $value .= ' [nid:'. $nid .']';
+    $value .= ' [nid:'.$nid.']';
     return array($field_key => $value);
   }
   return array($field_key => NULL);
@@ -586,7 +586,7 @@ 
   // element, it can wrap around the optionwidgets_select element.
   // This will create a new, nested instance of the field.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'optionwidgets_select',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
@@ -620,7 +620,7 @@ 
   // element, it can wrap around the optionwidgets_select element.
   // This will create a new, nested instance of the field.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'optionwidgets_buttons',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
@@ -654,12 +654,12 @@ 
   // element, it can wrap around the text_textfield element and add an autocomplete
   // path and some extra processing to it.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
 
   $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
-    '#autocomplete_path' => 'nodereference/autocomplete/'. $element['#field_name'],
+    '#autocomplete_path' => 'nodereference/autocomplete/'.$element['#field_name'],
     // The following values were set by the content module and need
     // to be passed down to the nested element.
     '#title' => $element['#title'],
@@ -697,7 +697,7 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function nodereference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
 
   $value = $form_state['values'];
   $new_parents = array();
@@ -805,7 +805,7 @@ 
   static $results = array();
 
   // Create unique id for static cache.
-  $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
+  $cid = $field['field_name'].':'.$match.':'.($string !== '' ? $string : implode('-', $ids)).':'.$limit;
   if (!isset($results[$cid])) {
     $references = FALSE;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
@@ -931,15 +931,15 @@ 
       'equals' => "= '%s'",
       'starts_with' => "$like '%s%%'",
     );
-    $where[] = 'n.title '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
+    $where[] = 'n.title '.(isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
   }
   elseif ($ids) {
-    $where[] = 'n.nid IN (' . db_placeholders($ids) . ')';
+    $where[] = 'n.nid IN ('.db_placeholders($ids).')';
     $args = array_merge($args, $ids);
   }
 
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
+  $where_clause = $where ? 'WHERE ('.implode(') AND (', $where).')' : '';
   $sql = db_rewrite_sql("SELECT n.nid, n.title AS node_title, n.type AS node_type FROM {node} n $where_clause ORDER BY n.title, n.type");
   $result = $limit ? db_query_range($sql, $args, 0, $limit) : db_query($sql, $args);
   $references = array();
@@ -975,7 +975,7 @@ 
   $references = _nodereference_potential_references($field, $string, $match, array(), 10);
   foreach ($references as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
-    $matches[$row['title'] ." [nid:$id]"] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
+    $matches[$row['title']." [nid:$id]"] = '<div class="reference-autocomplete">'.$row['rendered'].'</div>';
   }
   drupal_json($matches);
 }
@@ -1024,9 +1024,9 @@ 
     $node = $vars['node'];
     $field = $node->referencing_field;
     $vars['template_files'][] = 'node-nodereference';
-    $vars['template_files'][] = 'node-nodereference-'. $field['field_name'];
-    $vars['template_files'][] = 'node-nodereference-'. $node->type;
-    $vars['template_files'][] = 'node-nodereference-'. $field['field_name'] .'-'. $node->type;
+    $vars['template_files'][] = 'node-nodereference-'.$field['field_name'];
+    $vars['template_files'][] = 'node-nodereference-'.$node->type;
+    $vars['template_files'][] = 'node-nodereference-'.$field['field_name'].'-'.$node->type;
   }
 }
 

Braces +15 added lines, -20 removed lines

@@ -96,8 +96,7 @@ 
           if ($view->base_table == 'node' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
               $views[t('Default Views')][$view->name] = $view->name;
-            }
-            else {
+            } else {
               $views[t('Existing Views')][$view->name] = $view->name;
             }
           }
@@ -125,8 +124,7 @@ 
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
           );
-        }
-        else {
+        } else {
           $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
@@ -212,10 +210,11 @@ 
         if (is_array($item) && !empty($item['nid'])) {
           if (is_numeric($item['nid'])) {
             $ids[] = $item['nid'];
-          }
-          else {
+          } else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+            if (is_array($item) && isset($item['_error_element'])) {
+                unset($item['_error_element']);
+            }
             form_set_error($error_element, t("%name: invalid input.", array('%name' => t($field['widget']['label']))));
           }
         }
@@ -226,7 +225,9 @@ 
         foreach ($items as $delta => $item) {
           if (is_array($item)) {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+            if (is_array($item) && isset($item['_error_element'])) {
+                unset($item['_error_element']);
+            }
             if (!empty($item['nid']) && !isset($refs[$item['nid']])) {
               form_set_error($error_element, t("%name: this post can't be referenced.", array('%name' => t($field['widget']['label']))));
             }
@@ -487,8 +488,7 @@ 
           '#element_validate' => array('_element_validate_integer_positive'),
           '#required' => TRUE,
         );
-      }
-      else {
+      } else {
         $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
       }
@@ -736,14 +736,12 @@ 
       if (!empty($title) && ($n = node_load($nid)) && trim($title) != trim($n->title)) {
         form_error($element[$field_key], t('%name: title mismatch. Please check your selection.', array('%name' => t($field['widget']['label']))));
       }
-    }
-    else {
+    } else {
       // No explicit nid.
       $reference = _nodereference_potential_references($field, $value, 'equals', NULL, 1);
       if (empty($reference)) {
         form_error($element[$field_key], t('%name: found no valid post with that title.', array('%name' => t($field['widget']['label']))));
-      }
-      else {
+      } else {
         // TODO:
         // the best thing would be to present the user with an additional form,
         // allowing the user to choose between valid candidates with the same title
@@ -868,8 +866,7 @@ 
     if (!empty($field['advanced_view_args'])) {
       // TODO: Support Tokens using token.module ?
       $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
-    }
-    else {
+    } else {
       $view_args = array();
     }
 
@@ -894,8 +891,7 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+  } else {
     $result = FALSE;
   }
 
@@ -933,8 +929,7 @@ 
     );
     $where[] = 'n.title '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+  } elseif ($ids) {
     $where[] = 'n.nid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
   }

drupal/sites/default/boinc/modules/contrib/cck/modules/userreference/userreference.module

Doc Comments +1 added lines, -1 removed lines

@@ -653,7 +653,7 @@
  * @param $ids
  *   Optional user ids to lookup (the $string and $match arguments will be
  *   ignored).
- * @param $limit
+ * @param integer $limit
  *   If non-zero, limit the size of the result set.
  *
  * @return

Indentation +320 added lines, -320 removed lines

@@ -10,258 +10,258 @@ 
  * Implementation of hook_menu().
  */
 function userreference_menu() {
-  $items = array();
-  $items['userreference/autocomplete'] = array(
+    $items = array();
+    $items['userreference/autocomplete'] = array(
     'title' => 'Userreference autocomplete',
     'page callback' => 'userreference_autocomplete',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function userreference_theme() {
-  return array(
+    return array(
     'userreference_select' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_buttons' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_autocomplete' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_formatter_default' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
     'userreference_formatter_plain' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
-  );
+    );
 }
 
 /**
  * Implementaion of hook_ctools_plugin_directory().
  */
 function userreference_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'relationships') {
+    if ($module == 'ctools' && $plugin == 'relationships') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_field_info().
  */
 function userreference_field_info() {
-  return array(
+    return array(
     'userreference' => array(
-      'label' => t('User reference'),
-      'description' => t('Store the ID of a related user as an integer value.'),
+        'label' => t('User reference'),
+        'description' => t('Store the ID of a related user as an integer value.'),
 //      'content_icon' => 'icon_content_noderef.png',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_settings().
  */
 function userreference_field_settings($op, $field) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $form['referenceable_roles'] = array(
+        $form['referenceable_roles'] = array(
         '#type' => 'checkboxes',
         '#title' => t('User roles that can be referenced'),
         '#default_value' => isset($field['referenceable_roles']) && is_array($field['referenceable_roles']) ? array_filter($field['referenceable_roles']) : array(),
         '#options' => user_roles(1),
-      );
-      $form['referenceable_status'] = array(
+        );
+        $form['referenceable_status'] = array(
         '#type' => 'radios',
         '#title' => t('User status that can be referenced'),
         '#default_value' => isset($field['referenceable_status']) ? $field['referenceable_status'] : '',
         '#options' => array('' => t('All users'), 1 => t('Active users'), 0 => t('Blocked users')),
-      );
-      if (module_exists('views')) {
+        );
+        if (module_exists('views')) {
         $views = array('--' => '--');
         $all_views = views_get_all_views();
         foreach ($all_views as $view) {
-          // Only 'users' views that have fields will work for our purpose.
-          if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
+            // Only 'users' views that have fields will work for our purpose.
+            if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
-              $views[t('Default Views')][$view->name] = $view->name;
+                $views[t('Default Views')][$view->name] = $view->name;
             }
             else {
-              $views[t('Existing Views')][$view->name] = $view->name;
+                $views[t('Existing Views')][$view->name] = $view->name;
+            }
             }
-          }
         }
 
         $form['advanced'] = array(
-           '#type' => 'fieldset',
-           '#title' => t('Advanced - Users that can be referenced (View)'),
-           '#collapsible' => TRUE,
-           '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
-         );
+            '#type' => 'fieldset',
+            '#title' => t('Advanced - Users that can be referenced (View)'),
+            '#collapsible' => TRUE,
+            '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
+            );
         if (count($views) > 1) {
-          $form['advanced']['advanced_view'] = array(
+            $form['advanced']['advanced_view'] = array(
             '#type' => 'select',
             '#title' => t('View used to select the users'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
             '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
-          $form['advanced']['advanced_view_args'] = array(
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+            );
+            $form['advanced']['advanced_view_args'] = array(
             '#type' => 'textfield',
             '#title' => t('View arguments'),
             '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
-          );
+            );
         }
         else {
-          $form['advanced']['no_view_help'] = array(
+            $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+            );
+        }
         }
-      }
-      return $form;
+        return $form;
 
     case 'save':
       $settings = array('referenceable_roles', 'referenceable_status');
-      if (module_exists('views')) {
+        if (module_exists('views')) {
         $settings[] = 'advanced_view';
         $settings[] = 'advanced_view_args';
-      }
-      return $settings;
+        }
+        return $settings;
 
     case 'database columns':
       $columns = array(
         'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
-      );
-      return $columns;
+        );
+        return $columns;
 
     case 'views data':
       $data = content_views_field_views_data($field);
-      $db_info = content_database_info($field);
-      $table_alias = content_views_tablename($field);
-
-      // Filter : swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
-      // Argument: get the user name for summaries.
-      // We need to join a new instance of the users table.
-      $data["users_$table_alias"]['table']['join']['node'] = array(
+        $db_info = content_database_info($field);
+        $table_alias = content_views_tablename($field);
+
+        // Filter : swap the handler to the 'in' operator.
+        $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+        // Argument: get the user name for summaries.
+        // We need to join a new instance of the users table.
+        $data["users_$table_alias"]['table']['join']['node'] = array(
         'table' => 'users',
         'field' => 'uid',
         'left_table' => $table_alias,
         'left_field' => $field['field_name'] .'_uid',
-      );
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
-      // Relationship: Add a relationship for related user.
-      $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
+        );
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
+        // Relationship: Add a relationship for related user.
+        $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
         'base' => 'users',
         'field' => $db_info['columns']['uid']['column'],
         'handler' => 'content_handler_relationship',
         'label' => t($field['widget']['label']),
         'content_field_name' => $field['field_name'],
-      );
-      return $data;
+        );
+        return $data;
 
-  }
+    }
 }
 
 /**
  * Implementation of hook_field().
  */
 function userreference_field($op, &$node, $field, &$items, $teaser, $page) {
-  switch ($op) {
+    switch ($op) {
     case 'validate':
       // Extract uids to check.
       $ids = array();
-      foreach ($items as $delta => $item) {
+        foreach ($items as $delta => $item) {
         if (is_array($item) && !empty($item['uid'])) {
-          if (is_numeric($item['uid'])) {
+            if (is_numeric($item['uid'])) {
             $ids[] = $item['uid'];
-          }
-          else {
+            }
+            else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
-          }
+            }
+        }
         }
-      }
-      // Prevent performance hog if there are no ids to check.
-      if ($ids) {
+        // Prevent performance hog if there are no ids to check.
+        if ($ids) {
         $refs = _userreference_potential_references($field, '', NULL, $ids);
         foreach ($items as $delta => $item) {
-          if (is_array($item)) {
+            if (is_array($item)) {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             if (!empty($item['uid']) && !isset($refs[$item['uid']])) {
-              form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
+                form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
+            }
             }
-          }
         }
-      }
-      return $items;
-  }
+        }
+        return $items;
+    }
 }
 
 /**
  * Implementation of hook_content_is_empty().
  */
 function userreference_content_is_empty($item, $field) {
-  if (empty($item['uid'])) {
+    if (empty($item['uid'])) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Implementation of hook_field_formatter_info().
  */
 function userreference_field_formatter_info() {
-  return array(
+    return array(
     'default' => array(
-      'label' => t('Default'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Default'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'plain' => array(
-      'label' => t('Plain text'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Plain text'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
-  );
+    );
 }
 
 /**
  * Theme function for 'default' userreference field formatter.
  */
 function theme_userreference_formatter_default($element) {
-  $output = '';
+    $output = '';
 
-  if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
+    if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
     $output = theme('username', $account);
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Theme function for 'plain' userreference field formatter.
  */
 function theme_userreference_formatter_plain($element) {
-  $output = '';
-  if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
+    $output = '';
+    if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
     $output = $account->name;
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
@@ -279,32 +279,32 @@ 
  * differently.
  */
 function userreference_widget_info() {
-  return array(
+    return array(
     'userreference_select' => array(
-      'label' => t('Select list'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Select list'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'userreference_buttons' => array(
-      'label' => t('Check boxes/radio buttons'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Check boxes/radio buttons'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'userreference_autocomplete' => array(
-      'label' => t('Autocomplete text field'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array(
+        'label' => t('Autocomplete text field'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -320,23 +320,23 @@ 
  * (see nodereference and userreference).
  */
 function userreference_elements() {
-  return array(
+    return array(
     'userreference_select' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('userreference_select_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('userreference_select_process'),
     ),
     'userreference_buttons' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('userreference_buttons_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('userreference_buttons_process'),
     ),
     'userreference_autocomplete' => array(
-      '#input' => TRUE,
-      '#columns' => array('name'), '#delta' => 0,
-      '#process' => array('userreference_autocomplete_process'),
-      '#autocomplete_path' => FALSE,
-      ),
+        '#input' => TRUE,
+        '#columns' => array('name'), '#delta' => 0,
+        '#process' => array('userreference_autocomplete_process'),
+        '#autocomplete_path' => FALSE,
+        ),
     );
 }
 
@@ -344,45 +344,45 @@ 
  * Implementation of hook_widget_settings().
  */
 function userreference_widget_settings($op, $widget) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'userreference_autocomplete') {
+        $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
+        $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+        if ($widget['type'] == 'userreference_autocomplete') {
         $form['autocomplete_match'] = array(
-          '#type' => 'select',
-          '#title' => t('Autocomplete matching'),
-          '#default_value' => $match,
-          '#options' => array(
+            '#type' => 'select',
+            '#title' => t('Autocomplete matching'),
+            '#default_value' => $match,
+            '#options' => array(
             'starts_with' => t('Starts with'),
             'contains' => t('Contains'),
-          ),
-          '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
+            ),
+            '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
         );
         $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+            '#type' => 'textfield',
+            '#title' => t('Size of textfield'),
+            '#default_value' => $size,
+            '#element_validate' => array('_element_validate_integer_positive'),
+            '#required' => TRUE,
         );
-      }
-      else {
+        }
+        else {
         $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      $form['reverse_link'] = array(
+        }
+        $form['reverse_link'] = array(
         '#type' => 'checkbox',
         '#title' => t('Reverse link'),
         '#default_value' => isset($widget['reverse_link']) ? $widget['reverse_link'] : 0,
         '#description' => t('If selected, a reverse link back to the referencing node will displayed on the referenced user record.'),
-      );
-      return $form;
+        );
+        return $form;
 
     case 'save':
       return array('autocomplete_match', 'size', 'reverse_link');
-  }
+    }
 }
 
 /**
@@ -417,30 +417,30 @@ 
  *   the form item for a single element for this field
  */
 function userreference_widget(&$form, &$form_state, $field, $items, $delta = 0) {
-  switch ($field['widget']['type']) {
+    switch ($field['widget']['type']) {
     case 'userreference_select':
       $element = array(
         '#type' => 'userreference_select',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'userreference_buttons':
       $element = array(
         '#type' => 'userreference_buttons',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'userreference_autocomplete':
       $element = array(
         '#type' => 'userreference_autocomplete',
         '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
         '#value_callback' => 'userreference_autocomplete_value',
-      );
-      break;
-  }
-  return $element;
+        );
+        break;
+    }
+    return $element;
 }
 
 /**
@@ -449,12 +449,12 @@ 
  * Substitute in the user name for the uid.
  */
 function userreference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
-  if (!empty($element['#default_value'][$field_key])) {
+    $field_key  = $element['#columns'][0];
+    if (!empty($element['#default_value'][$field_key])) {
     $value = db_result(db_query("SELECT name FROM {users} WHERE uid = '%d'", $element['#default_value'][$field_key]));
     return array($field_key => $value);
-  }
-  return array($field_key => NULL);
+    }
+    return array($field_key => NULL);
 }
 
 /**
@@ -466,11 +466,11 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function userreference_select_process($element, $edit, $form_state, $form) {
-  // The userreference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The userreference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_select',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -482,12 +482,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -499,11 +499,11 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function userreference_buttons_process($element, $edit, $form_state, $form) {
-  // The userreference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The userreference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_buttons',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -515,12 +515,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -531,13 +531,13 @@ 
  *
  */
 function userreference_autocomplete_process($element, $edit, $form_state, $form) {
-  // The userreference autocomplete widget doesn't need to create its own
-  // element, it can wrap around the text_textfield element and add an autocomplete
-  // path and some extra processing to it.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+    // The userreference autocomplete widget doesn't need to create its own
+    // element, it can wrap around the text_textfield element and add an autocomplete
+    // path and some extra processing to it.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
 
-  $element[$field_key] = array(
+    $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     '#autocomplete_path' => 'userreference/autocomplete/'. $element['#field_name'],
@@ -550,20 +550,20 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_autocomplete_validate');
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_autocomplete_validate');
 
-  // Used so that hook_field('validate') knows where to flag an error.
-  $element['_error_element'] = array(
+    // Used so that hook_field('validate') knows where to flag an error.
+    $element['_error_element'] = array(
     '#type' => 'value',
     // Wrapping the element around a text_textfield element creates a
     // nested element, so the final id will look like 'field-name-0-uid-uid'.
     '#value' => implode('][', array_merge($element['#parents'], array($field_key, $field_key))),
-  );
-  return $element;
+    );
+    return $element;
 }
 
 /**
@@ -578,20 +578,20 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function userreference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+    $field_key  = $element['#columns'][0];
 
-  $value = $form_state['values'];
-  $new_parents = array();
-  foreach ($element['#parents'] as $parent) {
+    $value = $form_state['values'];
+    $new_parents = array();
+    foreach ($element['#parents'] as $parent) {
     $value = $value[$parent];
     // Use === to be sure we get right results if parent is a zero (delta) value.
     if ($parent === $field_key) {
-      $element['#parents'] = $new_parents;
-      form_set_value($element, $value, $form_state);
-      break;
+        $element['#parents'] = $new_parents;
+        form_set_value($element, $value, $form_state);
+        break;
     }
     $new_parents[] = $parent;
-  }
+    }
 }
 
 /**
@@ -602,36 +602,36 @@ 
  * back to its original location, 'field-name-0-uid'.
  */
 function userreference_autocomplete_validate($element, &$form_state) {
-  $field_name = $element['#field_name'];
-  $type_name = $element['#type_name'];
-  $field = content_fields($field_name, $type_name);
-  $field_key = $element['#columns'][0];
-  $value = $element['#value'][$field_key];
-  $uid = NULL;
-  if (!empty($value)) {
+    $field_name = $element['#field_name'];
+    $type_name = $element['#type_name'];
+    $field = content_fields($field_name, $type_name);
+    $field_key = $element['#columns'][0];
+    $value = $element['#value'][$field_key];
+    $uid = NULL;
+    if (!empty($value)) {
     $reference = _userreference_potential_references($field, $value, 'equals', NULL, 1);
     if (empty($reference)) {
-      form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
+        form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
     }
     else {
-      $uid = key($reference);
+        $uid = key($reference);
+    }
     }
-  }
-  form_set_value($element, $uid, $form_state);
+    form_set_value($element, $uid, $form_state);
 }
 
 /**
  * Implementation of hook_allowed_values().
  */
 function userreference_allowed_values($field) {
-  $references = _userreference_potential_references($field);
+    $references = _userreference_potential_references($field);
 
-  $options = array();
-  foreach ($references as $key => $value) {
+    $options = array();
+    foreach ($references as $key => $value) {
     $options[$key] = $value['rendered'];
-  }
+    }
 
-  return $options;
+    return $options;
 }
 
 /**
@@ -667,26 +667,26 @@ 
  *   )
  */
 function _userreference_potential_references($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  static $results = array();
+    static $results = array();
 
-  // Create unique id for static cache.
-  $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
-  if (!isset($results[$cid])) {
+    // Create unique id for static cache.
+    $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
+    if (!isset($results[$cid])) {
     $references = FALSE;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
-      $references = _userreference_potential_references_views($field, $string, $match, $ids, $limit);
+        $references = _userreference_potential_references_views($field, $string, $match, $ids, $limit);
     }
     // If the view doesn't exist, we got FALSE, and fallback to the regular 'standard mode'.
 
     if ($references === FALSE) {
-      $references = _userreference_potential_references_standard($field, $string, $match, $ids, $limit);
+        $references = _userreference_potential_references_standard($field, $string, $match, $ids, $limit);
     }
 
     // Store the results.
     $results[$cid] = !empty($references) ? $references : array();
-  }
+    }
 
-  return $results[$cid];
+    return $results[$cid];
 }
 
 /**
@@ -694,9 +694,9 @@ 
  * case of Views-defined referenceable users.
  */
 function _userreference_potential_references_views($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $view_name = $field['advanced_view'];
+    $view_name = $field['advanced_view'];
 
-  if ($view = views_get_view($view_name)) {
+    if ($view = views_get_view($view_name)) {
     // We add a display, and let it derive from the 'default' display.
     // TODO: We should let the user pick a display in the fields settings - sort of requires AHAH...
     $display = $view->add_display('content_references');
@@ -713,12 +713,12 @@ 
     // Additional options to let content_plugin_display_references::query()
     // narrow the results.
     $options = array(
-      'table' => 'users',
-      'field_string' => 'name',
-      'string' => $string,
-      'match' => $match,
-      'field_id' => 'uid',
-      'ids' => $ids,
+        'table' => 'users',
+        'field_string' => 'name',
+        'string' => $string,
+        'match' => $match,
+        'field_id' => 'uid',
+        'ids' => $ids,
     );
     $view->display_handler->set_option('content_options', $options);
 
@@ -731,26 +731,26 @@ 
 
     // Get arguments for the view.
     if (!empty($field['advanced_view_args'])) {
-      // TODO: Support Tokens using token.module ?
-      $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
+        // TODO: Support Tokens using token.module ?
+        $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
     }
     else {
-      $view_args = array();
+        $view_args = array();
     }
 
     // We do need name field, so add it if not present (unlikely, but...)
     $fields = $view->get_items('field', $display);
     if (!isset($fields['name'])) {
-      $view->add_item($display, 'field', 'users', 'name');
+        $view->add_item($display, 'field', 'users', 'name');
     }
 
     // If not set, make all fields inline and define a separator.
     $options = $view->display_handler->get_option('row_options');
     if (empty($options['inline'])) {
-      $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
+        $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
     }
     if (empty($options['separator'])) {
-      $options['separator'] = '-';
+        $options['separator'] = '-';
     }
     $view->display_handler->set_option('row_options', $options);
 
@@ -759,12 +759,12 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+    }
+    else {
     $result = FALSE;
-  }
+    }
 
-  return $result;
+    return $result;
 }
 
 /**
@@ -772,112 +772,112 @@ 
  * referenceable users defined by user role and status
  */
 function _userreference_potential_references_standard($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $where = array();
-  $args = array();
-  $join = array();
+    $where = array();
+    $args = array();
+    $join = array();
 
-  if ($string !== '') {
+    if ($string !== '') {
     $like = $GLOBALS["db_type"] == 'pgsql' ? "ILIKE" : "LIKE";
     $match_clauses = array(
-      'contains' => "$like '%%%s%%'",
-      'equals' => "= '%s'",
-      'starts_with' => "$like '%s%%'",
+        'contains' => "$like '%%%s%%'",
+        'equals' => "= '%s'",
+        'starts_with' => "$like '%s%%'",
     );
     $where[] = 'u.name '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+    }
+    elseif ($ids) {
     $where[] = 'u.uid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
-  }
-  else {
+    }
+    else {
     $where[] = "u.uid > 0";
-  }
+    }
 
-  $roles = array();
-  if (isset($field['referenceable_roles']) && is_array($field['referenceable_roles'])) {
+    $roles = array();
+    if (isset($field['referenceable_roles']) && is_array($field['referenceable_roles'])) {
     // keep only selected checkboxes
     $roles = array_filter($field['referenceable_roles']);
     // filter invalid values that seems to get through sometimes ??
     $roles = array_intersect(array_keys(user_roles(1)), $roles);
-  }
-  if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
+    }
+    if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
     $where[] = "r.rid IN (". implode($roles, ',') .")";
     $join[] = 'LEFT JOIN {users_roles} r ON u.uid = r.uid';
-  }
+    }
 
-  if (isset($field['referenceable_status']) && is_numeric($field['referenceable_status'])) {
+    if (isset($field['referenceable_status']) && is_numeric($field['referenceable_status'])) {
     $where[] = 'u.status = %d';
     $args[] = $field['referenceable_status'];
-  }
+    }
 
-  $users = array();
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
-  $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
-  while ($user = db_fetch_object($result)) {
+    $users = array();
+    $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
+    $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
+    while ($user = db_fetch_object($result)) {
     $users[$user->uid] = array(
-      'title' => $user->name,
-      'rendered' => check_plain($user->name),
+        'title' => $user->name,
+        'rendered' => check_plain($user->name),
     );
-  }
-  return $users;
+    }
+    return $users;
 }
 
 /**
  * Menu callback; Retrieve a pipe delimited string of autocomplete suggestions for existing users
  */
 function userreference_autocomplete($field_name, $string = '') {
-  $fields = content_fields();
-  $field = $fields[$field_name];
-  $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
-  $matches = array();
+    $fields = content_fields();
+    $field = $fields[$field_name];
+    $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
+    $matches = array();
 
-  $references = _userreference_potential_references($field, $string, $match, array(), 10);
-  foreach ($references as $id => $row) {
+    $references = _userreference_potential_references($field, $string, $match, array(), 10);
+    foreach ($references as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
     $matches[$row['title']] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
-  }
-  drupal_json($matches);
+    }
+    drupal_json($matches);
 }
 
 /**
  * Implementation of hook_user().
  */
 function userreference_user($type, &$edit, &$account) {
-  switch ($type) {
+    switch ($type) {
     case 'load':
       // Only add links if we are on the user 'view' page.
       if (arg(0) != 'user' || arg(2)) {
         return;
-      }
-      // find CCK userreference field tables
-      // search through them for matching user ids and load those nodes
-      $additions = array();
-      $types = content_types();
-
-      // Find the table and columns to search through, if the same
-      // table comes up in more than one content type, we only need
-      // to search it once.
-      $search_tables = array();
-      foreach ($types as $type_name => $type) {
+        }
+        // find CCK userreference field tables
+        // search through them for matching user ids and load those nodes
+        $additions = array();
+        $types = content_types();
+
+        // Find the table and columns to search through, if the same
+        // table comes up in more than one content type, we only need
+        // to search it once.
+        $search_tables = array();
+        foreach ($types as $type_name => $type) {
         foreach ($type['fields'] as $field) {
-          // Only add tables when reverse link has been selected.
-          if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
+            // Only add tables when reverse link has been selected.
+            if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
             $db_info = content_database_info($field);
             $search_tables[$db_info['table']][] = $db_info['columns']['uid']['column'];
-          }
+            }
+        }
         }
-      }
-      foreach ($search_tables as $table => $columns) {
+        foreach ($search_tables as $table => $columns) {
         foreach ($columns as $column) {
-          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
-          while ($data = db_fetch_object($ids)) {
+            $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
+            while ($data = db_fetch_object($ids)) {
             $additions[$data->type][$data->nid] = $data->title;
-          }
+            }
         }
-      }
-      $account->userreference = $additions;
-      break;
+        }
+        $account->userreference = $additions;
+        break;
 
     case 'view':
       if (!empty($account->userreference)) {
@@ -885,28 +885,28 @@ 
         $additions = array();
         $values = array();
         foreach ($account->userreference as $node_type => $nodes) {
-          foreach ($nodes as $nid => $title) {
+            foreach ($nodes as $nid => $title) {
             $values[$node_type][] = l($title, 'node/'. $nid);
-          }
-          if (isset($values[$node_type])) {
+            }
+            if (isset($values[$node_type])) {
             $additions[] = array(
-              '#type' => 'user_profile_item',
-              '#title' => check_plain($node_types[$node_type]['name']),
-              '#value' => theme('item_list', $values[$node_type]),
+                '#type' => 'user_profile_item',
+                '#title' => check_plain($node_types[$node_type]['name']),
+                '#value' => theme('item_list', $values[$node_type]),
             );
-          }
+            }
         }
         if ($additions) {
-          $account->content['userreference'] = $additions + array(
+            $account->content['userreference'] = $additions + array(
             '#type' => 'user_profile_category',
             '#attributes' => array('class' => 'user-member'),
             '#title' => t('Related content'),
             '#weight' => 10,
-          );
+            );
         }
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
@@ -921,13 +921,13 @@ 
  * $element['#delta]  is the position of this element in the group
  */
 function theme_userreference_select($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_userreference_buttons($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_userreference_autocomplete($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
\ No newline at end of file

Switch Indentation +226 added lines, -226 removed lines

@@ -70,108 +70,108 @@ 
  */
 function userreference_field_settings($op, $field) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $form['referenceable_roles'] = array(
-        '#type' => 'checkboxes',
-        '#title' => t('User roles that can be referenced'),
-        '#default_value' => isset($field['referenceable_roles']) && is_array($field['referenceable_roles']) ? array_filter($field['referenceable_roles']) : array(),
-        '#options' => user_roles(1),
-      );
-      $form['referenceable_status'] = array(
-        '#type' => 'radios',
-        '#title' => t('User status that can be referenced'),
-        '#default_value' => isset($field['referenceable_status']) ? $field['referenceable_status'] : '',
-        '#options' => array('' => t('All users'), 1 => t('Active users'), 0 => t('Blocked users')),
-      );
-      if (module_exists('views')) {
-        $views = array('--' => '--');
-        $all_views = views_get_all_views();
-        foreach ($all_views as $view) {
-          // Only 'users' views that have fields will work for our purpose.
-          if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
-            if ($view->type == 'Default') {
-              $views[t('Default Views')][$view->name] = $view->name;
-            }
-            else {
-              $views[t('Existing Views')][$view->name] = $view->name;
-            }
+  case 'form':
+    $form = array();
+    $form['referenceable_roles'] = array(
+      '#type' => 'checkboxes',
+      '#title' => t('User roles that can be referenced'),
+      '#default_value' => isset($field['referenceable_roles']) && is_array($field['referenceable_roles']) ? array_filter($field['referenceable_roles']) : array(),
+      '#options' => user_roles(1),
+    );
+    $form['referenceable_status'] = array(
+      '#type' => 'radios',
+      '#title' => t('User status that can be referenced'),
+      '#default_value' => isset($field['referenceable_status']) ? $field['referenceable_status'] : '',
+      '#options' => array('' => t('All users'), 1 => t('Active users'), 0 => t('Blocked users')),
+    );
+    if (module_exists('views')) {
+      $views = array('--' => '--');
+      $all_views = views_get_all_views();
+      foreach ($all_views as $view) {
+        // Only 'users' views that have fields will work for our purpose.
+        if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
+          if ($view->type == 'Default') {
+            $views[t('Default Views')][$view->name] = $view->name;
+          }
+          else {
+            $views[t('Existing Views')][$view->name] = $view->name;
           }
-        }
-
-        $form['advanced'] = array(
-           '#type' => 'fieldset',
-           '#title' => t('Advanced - Users that can be referenced (View)'),
-           '#collapsible' => TRUE,
-           '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
-         );
-        if (count($views) > 1) {
-          $form['advanced']['advanced_view'] = array(
-            '#type' => 'select',
-            '#title' => t('View used to select the users'),
-            '#options' => $views,
-            '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
-            '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
-          $form['advanced']['advanced_view_args'] = array(
-            '#type' => 'textfield',
-            '#title' => t('View arguments'),
-            '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
-            '#required' => FALSE,
-            '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
-          );
-        }
-        else {
-          $form['advanced']['no_view_help'] = array(
-            '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
         }
       }
-      return $form;
 
-    case 'save':
-      $settings = array('referenceable_roles', 'referenceable_status');
-      if (module_exists('views')) {
-        $settings[] = 'advanced_view';
-        $settings[] = 'advanced_view_args';
+      $form['advanced'] = array(
+         '#type' => 'fieldset',
+         '#title' => t('Advanced - Users that can be referenced (View)'),
+         '#collapsible' => TRUE,
+         '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
+       );
+      if (count($views) > 1) {
+        $form['advanced']['advanced_view'] = array(
+          '#type' => 'select',
+          '#title' => t('View used to select the users'),
+          '#options' => $views,
+          '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
+          '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
+            t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+        );
+        $form['advanced']['advanced_view_args'] = array(
+          '#type' => 'textfield',
+          '#title' => t('View arguments'),
+          '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
+          '#required' => FALSE,
+          '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
+        );
+      }
+      else {
+        $form['advanced']['no_view_help'] = array(
+          '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
+            t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+        );
       }
-      return $settings;
+    }
+    return $form;
 
-    case 'database columns':
-      $columns = array(
-        'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
-      );
-      return $columns;
-
-    case 'views data':
-      $data = content_views_field_views_data($field);
-      $db_info = content_database_info($field);
-      $table_alias = content_views_tablename($field);
-
-      // Filter : swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
-      // Argument: get the user name for summaries.
-      // We need to join a new instance of the users table.
-      $data["users_$table_alias"]['table']['join']['node'] = array(
-        'table' => 'users',
-        'field' => 'uid',
-        'left_table' => $table_alias,
-        'left_field' => $field['field_name'] .'_uid',
-      );
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
-      // Relationship: Add a relationship for related user.
-      $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
-        'base' => 'users',
-        'field' => $db_info['columns']['uid']['column'],
-        'handler' => 'content_handler_relationship',
-        'label' => t($field['widget']['label']),
-        'content_field_name' => $field['field_name'],
-      );
-      return $data;
+  case 'save':
+    $settings = array('referenceable_roles', 'referenceable_status');
+    if (module_exists('views')) {
+      $settings[] = 'advanced_view';
+      $settings[] = 'advanced_view_args';
+    }
+    return $settings;
+
+  case 'database columns':
+    $columns = array(
+      'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
+    );
+    return $columns;
+
+  case 'views data':
+    $data = content_views_field_views_data($field);
+    $db_info = content_database_info($field);
+    $table_alias = content_views_tablename($field);
+
+    // Filter : swap the handler to the 'in' operator.
+    $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+    // Argument: get the user name for summaries.
+    // We need to join a new instance of the users table.
+    $data["users_$table_alias"]['table']['join']['node'] = array(
+      'table' => 'users',
+      'field' => 'uid',
+      'left_table' => $table_alias,
+      'left_field' => $field['field_name'] .'_uid',
+    );
+    $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
+    $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
+    $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
+    // Relationship: Add a relationship for related user.
+    $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
+      'base' => 'users',
+      'field' => $db_info['columns']['uid']['column'],
+      'handler' => 'content_handler_relationship',
+      'label' => t($field['widget']['label']),
+      'content_field_name' => $field['field_name'],
+    );
+    return $data;
 
   }
 }
@@ -181,35 +181,35 @@ 
  */
 function userreference_field($op, &$node, $field, &$items, $teaser, $page) {
   switch ($op) {
-    case 'validate':
-      // Extract uids to check.
-      $ids = array();
-      foreach ($items as $delta => $item) {
-        if (is_array($item) && !empty($item['uid'])) {
-          if (is_numeric($item['uid'])) {
-            $ids[] = $item['uid'];
-          }
-          else {
-            $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-            form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
-          }
+  case 'validate':
+    // Extract uids to check.
+    $ids = array();
+    foreach ($items as $delta => $item) {
+      if (is_array($item) && !empty($item['uid'])) {
+        if (is_numeric($item['uid'])) {
+          $ids[] = $item['uid'];
+        }
+        else {
+          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+          form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
         }
       }
-      // Prevent performance hog if there are no ids to check.
-      if ($ids) {
-        $refs = _userreference_potential_references($field, '', NULL, $ids);
-        foreach ($items as $delta => $item) {
-          if (is_array($item)) {
-            $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-            if (!empty($item['uid']) && !isset($refs[$item['uid']])) {
-              form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
-            }
+    }
+    // Prevent performance hog if there are no ids to check.
+    if ($ids) {
+      $refs = _userreference_potential_references($field, '', NULL, $ids);
+      foreach ($items as $delta => $item) {
+        if (is_array($item)) {
+          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+          if (!empty($item['uid']) && !isset($refs[$item['uid']])) {
+            form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
           }
         }
       }
-      return $items;
+    }
+    return $items;
   }
 }
 
@@ -345,43 +345,43 @@ 
  */
 function userreference_widget_settings($op, $widget) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'userreference_autocomplete') {
-        $form['autocomplete_match'] = array(
-          '#type' => 'select',
-          '#title' => t('Autocomplete matching'),
-          '#default_value' => $match,
-          '#options' => array(
-            'starts_with' => t('Starts with'),
-            'contains' => t('Contains'),
-          ),
-          '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
-        );
-        $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
-        );
-      }
-      else {
-        $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
-        $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      $form['reverse_link'] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Reverse link'),
-        '#default_value' => isset($widget['reverse_link']) ? $widget['reverse_link'] : 0,
-        '#description' => t('If selected, a reverse link back to the referencing node will displayed on the referenced user record.'),
+  case 'form':
+    $form = array();
+    $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
+    $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+    if ($widget['type'] == 'userreference_autocomplete') {
+      $form['autocomplete_match'] = array(
+        '#type' => 'select',
+        '#title' => t('Autocomplete matching'),
+        '#default_value' => $match,
+        '#options' => array(
+          'starts_with' => t('Starts with'),
+          'contains' => t('Contains'),
+        ),
+        '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
       );
-      return $form;
+      $form['size'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Size of textfield'),
+        '#default_value' => $size,
+        '#element_validate' => array('_element_validate_integer_positive'),
+        '#required' => TRUE,
+      );
+    }
+    else {
+      $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
+      $form['size'] = array('#type' => 'hidden', '#value' => $size);
+    }
+    $form['reverse_link'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Reverse link'),
+      '#default_value' => isset($widget['reverse_link']) ? $widget['reverse_link'] : 0,
+      '#description' => t('If selected, a reverse link back to the referencing node will displayed on the referenced user record.'),
+    );
+    return $form;
 
-    case 'save':
-      return array('autocomplete_match', 'size', 'reverse_link');
+  case 'save':
+    return array('autocomplete_match', 'size', 'reverse_link');
   }
 }
 
@@ -418,27 +418,27 @@ 
  */
 function userreference_widget(&$form, &$form_state, $field, $items, $delta = 0) {
   switch ($field['widget']['type']) {
-    case 'userreference_select':
-      $element = array(
-        '#type' => 'userreference_select',
-        '#default_value' => $items,
-      );
-      break;
+  case 'userreference_select':
+    $element = array(
+      '#type' => 'userreference_select',
+      '#default_value' => $items,
+    );
+    break;
 
-    case 'userreference_buttons':
-      $element = array(
-        '#type' => 'userreference_buttons',
-        '#default_value' => $items,
-      );
-      break;
+  case 'userreference_buttons':
+    $element = array(
+      '#type' => 'userreference_buttons',
+      '#default_value' => $items,
+    );
+    break;
 
-    case 'userreference_autocomplete':
-      $element = array(
-        '#type' => 'userreference_autocomplete',
-        '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
-        '#value_callback' => 'userreference_autocomplete_value',
-      );
-      break;
+  case 'userreference_autocomplete':
+    $element = array(
+      '#type' => 'userreference_autocomplete',
+      '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
+      '#value_callback' => 'userreference_autocomplete_value',
+    );
+    break;
   }
   return $element;
 }
@@ -845,67 +845,67 @@ 
  */
 function userreference_user($type, &$edit, &$account) {
   switch ($type) {
-    case 'load':
-      // Only add links if we are on the user 'view' page.
-      if (arg(0) != 'user' || arg(2)) {
-        return;
-      }
-      // find CCK userreference field tables
-      // search through them for matching user ids and load those nodes
-      $additions = array();
-      $types = content_types();
-
-      // Find the table and columns to search through, if the same
-      // table comes up in more than one content type, we only need
-      // to search it once.
-      $search_tables = array();
-      foreach ($types as $type_name => $type) {
-        foreach ($type['fields'] as $field) {
-          // Only add tables when reverse link has been selected.
-          if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
-            $db_info = content_database_info($field);
-            $search_tables[$db_info['table']][] = $db_info['columns']['uid']['column'];
-          }
+  case 'load':
+    // Only add links if we are on the user 'view' page.
+    if (arg(0) != 'user' || arg(2)) {
+      return;
+    }
+    // find CCK userreference field tables
+    // search through them for matching user ids and load those nodes
+    $additions = array();
+    $types = content_types();
+
+    // Find the table and columns to search through, if the same
+    // table comes up in more than one content type, we only need
+    // to search it once.
+    $search_tables = array();
+    foreach ($types as $type_name => $type) {
+      foreach ($type['fields'] as $field) {
+        // Only add tables when reverse link has been selected.
+        if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
+          $db_info = content_database_info($field);
+          $search_tables[$db_info['table']][] = $db_info['columns']['uid']['column'];
         }
       }
-      foreach ($search_tables as $table => $columns) {
-        foreach ($columns as $column) {
-          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
-          while ($data = db_fetch_object($ids)) {
-            $additions[$data->type][$data->nid] = $data->title;
-          }
+    }
+    foreach ($search_tables as $table => $columns) {
+      foreach ($columns as $column) {
+        $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
+        while ($data = db_fetch_object($ids)) {
+          $additions[$data->type][$data->nid] = $data->title;
         }
       }
-      $account->userreference = $additions;
-      break;
+    }
+    $account->userreference = $additions;
+    break;
 
-    case 'view':
-      if (!empty($account->userreference)) {
-        $node_types = content_types();
-        $additions = array();
-        $values = array();
-        foreach ($account->userreference as $node_type => $nodes) {
-          foreach ($nodes as $nid => $title) {
-            $values[$node_type][] = l($title, 'node/'. $nid);
-          }
-          if (isset($values[$node_type])) {
-            $additions[] = array(
-              '#type' => 'user_profile_item',
-              '#title' => check_plain($node_types[$node_type]['name']),
-              '#value' => theme('item_list', $values[$node_type]),
-            );
-          }
+  case 'view':
+    if (!empty($account->userreference)) {
+      $node_types = content_types();
+      $additions = array();
+      $values = array();
+      foreach ($account->userreference as $node_type => $nodes) {
+        foreach ($nodes as $nid => $title) {
+          $values[$node_type][] = l($title, 'node/'. $nid);
         }
-        if ($additions) {
-          $account->content['userreference'] = $additions + array(
-            '#type' => 'user_profile_category',
-            '#attributes' => array('class' => 'user-member'),
-            '#title' => t('Related content'),
-            '#weight' => 10,
+        if (isset($values[$node_type])) {
+          $additions[] = array(
+            '#type' => 'user_profile_item',
+            '#title' => check_plain($node_types[$node_type]['name']),
+            '#value' => theme('item_list', $values[$node_type]),
           );
         }
       }
-      break;
+      if ($additions) {
+        $account->content['userreference'] = $additions + array(
+          '#type' => 'user_profile_category',
+          '#attributes' => array('class' => 'user-member'),
+          '#title' => t('Related content'),
+          '#weight' => 10,
+        );
+      }
+    }
+    break;
   }
 }
 

Spacing +24 added lines, -24 removed lines

@@ -48,7 +48,7 @@ 
  */
 function userreference_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'relationships') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -111,7 +111,7 @@ 
             '#title' => t('View used to select the users'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
-            '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
+            '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>').
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
           );
           $form['advanced']['advanced_view_args'] = array(
@@ -124,7 +124,7 @@ 
         }
         else {
           $form['advanced']['no_view_help'] = array(
-            '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
+            '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>').
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
           );
         }
@@ -151,20 +151,20 @@ 
       $table_alias = content_views_tablename($field);
 
       // Filter : swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+      $data[$table_alias][$field['field_name'].'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
       // Argument: get the user name for summaries.
       // We need to join a new instance of the users table.
       $data["users_$table_alias"]['table']['join']['node'] = array(
         'table' => 'users',
         'field' => 'uid',
         'left_table' => $table_alias,
-        'left_field' => $field['field_name'] .'_uid',
+        'left_field' => $field['field_name'].'_uid',
       );
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
+      $data[$table_alias][$field['field_name'].'_uid']['argument']['handler'] = 'content_handler_argument_reference';
+      $data[$table_alias][$field['field_name'].'_uid']['argument']['name table'] = "users_$table_alias";
+      $data[$table_alias][$field['field_name'].'_uid']['argument']['name field'] = 'name';
       // Relationship: Add a relationship for related user.
-      $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
+      $data[$table_alias][$field['field_name'].'_uid']['relationship'] = array(
         'base' => 'users',
         'field' => $db_info['columns']['uid']['column'],
         'handler' => 'content_handler_relationship',
@@ -449,7 +449,7 @@ 
  * Substitute in the user name for the uid.
  */
 function userreference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   if (!empty($element['#default_value'][$field_key])) {
     $value = db_result(db_query("SELECT name FROM {users} WHERE uid = '%d'", $element['#default_value'][$field_key]));
     return array($field_key => $value);
@@ -469,7 +469,7 @@ 
   // The userreference_select widget doesn't need to create its own
   // element, it can wrap around the optionwidgets_select element.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'optionwidgets_select',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
@@ -502,7 +502,7 @@ 
   // The userreference_select widget doesn't need to create its own
   // element, it can wrap around the optionwidgets_select element.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'optionwidgets_buttons',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
@@ -535,12 +535,12 @@ 
   // element, it can wrap around the text_textfield element and add an autocomplete
   // path and some extra processing to it.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
 
   $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
-    '#autocomplete_path' => 'userreference/autocomplete/'. $element['#field_name'],
+    '#autocomplete_path' => 'userreference/autocomplete/'.$element['#field_name'],
     // The following values were set by the content module and need
     // to be passed down to the nested element.
     '#title' => $element['#title'],
@@ -578,7 +578,7 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function userreference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
 
   $value = $form_state['values'];
   $new_parents = array();
@@ -670,7 +670,7 @@ 
   static $results = array();
 
   // Create unique id for static cache.
-  $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
+  $cid = $field['field_name'].':'.$match.':'.($string !== '' ? $string : implode('-', $ids)).':'.$limit;
   if (!isset($results[$cid])) {
     $references = FALSE;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
@@ -783,11 +783,11 @@ 
       'equals' => "= '%s'",
       'starts_with' => "$like '%s%%'",
     );
-    $where[] = 'u.name '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
+    $where[] = 'u.name '.(isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
   }
   elseif ($ids) {
-    $where[] = 'u.uid IN (' . db_placeholders($ids) . ')';
+    $where[] = 'u.uid IN ('.db_placeholders($ids).')';
     $args = array_merge($args, $ids);
   }
   else {
@@ -802,7 +802,7 @@ 
     $roles = array_intersect(array_keys(user_roles(1)), $roles);
   }
   if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
-    $where[] = "r.rid IN (". implode($roles, ',') .")";
+    $where[] = "r.rid IN (".implode($roles, ',').")";
     $join[] = 'LEFT JOIN {users_roles} r ON u.uid = r.uid';
   }
 
@@ -812,8 +812,8 @@ 
   }
 
   $users = array();
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
-  $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
+  $where_clause = $where ? 'WHERE ('.implode(') AND (', $where).')' : '';
+  $result = db_query('SELECT u.name, u.uid FROM {users} u '.implode(' ', $join)." $where_clause ORDER BY u.name ASC", $args);
   while ($user = db_fetch_object($result)) {
     $users[$user->uid] = array(
       'title' => $user->name,
@@ -835,7 +835,7 @@ 
   $references = _userreference_potential_references($field, $string, $match, array(), 10);
   foreach ($references as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
-    $matches[$row['title']] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
+    $matches[$row['title']] = '<div class="reference-autocomplete">'.$row['rendered'].'</div>';
   }
   drupal_json($matches);
 }
@@ -870,7 +870,7 @@ 
       }
       foreach ($search_tables as $table => $columns) {
         foreach ($columns as $column) {
-          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
+          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {".$table."} f ON n.vid = f.vid WHERE f.".$column."=".$account->uid." AND n.status = 1"));
           while ($data = db_fetch_object($ids)) {
             $additions[$data->type][$data->nid] = $data->title;
           }
@@ -886,7 +886,7 @@ 
         $values = array();
         foreach ($account->userreference as $node_type => $nodes) {
           foreach ($nodes as $nid => $title) {
-            $values[$node_type][] = l($title, 'node/'. $nid);
+            $values[$node_type][] = l($title, 'node/'.$nid);
           }
           if (isset($values[$node_type])) {
             $additions[] = array(

Braces +15 added lines, -20 removed lines

@@ -92,8 +92,7 @@ 
           if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
               $views[t('Default Views')][$view->name] = $view->name;
-            }
-            else {
+            } else {
               $views[t('Existing Views')][$view->name] = $view->name;
             }
           }
@@ -121,8 +120,7 @@ 
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
           );
-        }
-        else {
+        } else {
           $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
@@ -188,10 +186,11 @@ 
         if (is_array($item) && !empty($item['uid'])) {
           if (is_numeric($item['uid'])) {
             $ids[] = $item['uid'];
-          }
-          else {
+          } else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+            if (is_array($item) && isset($item['_error_element'])) {
+                unset($item['_error_element']);
+            }
             form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
           }
         }
@@ -202,7 +201,9 @@ 
         foreach ($items as $delta => $item) {
           if (is_array($item)) {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+            if (is_array($item) && isset($item['_error_element'])) {
+                unset($item['_error_element']);
+            }
             if (!empty($item['uid']) && !isset($refs[$item['uid']])) {
               form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
             }
@@ -367,8 +368,7 @@ 
           '#element_validate' => array('_element_validate_integer_positive'),
           '#required' => TRUE,
         );
-      }
-      else {
+      } else {
         $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
       }
@@ -612,8 +612,7 @@ 
     $reference = _userreference_potential_references($field, $value, 'equals', NULL, 1);
     if (empty($reference)) {
       form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       $uid = key($reference);
     }
   }
@@ -733,8 +732,7 @@ 
     if (!empty($field['advanced_view_args'])) {
       // TODO: Support Tokens using token.module ?
       $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
-    }
-    else {
+    } else {
       $view_args = array();
     }
 
@@ -759,8 +757,7 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+  } else {
     $result = FALSE;
   }
 
@@ -785,12 +782,10 @@ 
     );
     $where[] = 'u.name '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+  } elseif ($ids) {
     $where[] = 'u.uid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
-  }
-  else {
+  } else {
     $where[] = "u.uid > 0";
   }
 

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

Doc Comments +2 added lines, -1 removed lines

@@ -99,6 +99,7 @@ 
 
 /**
  * Presents a node editing or adding form for the given content profile.
+ * @param string $type
  */
 function content_profile_page_edit($type, $account) {
   drupal_set_title(check_plain($account->name));
@@ -211,7 +212,7 @@ 
  * @param $op
  *   When set to 'types', content profile content types are returned
  *   as type objects. When set to 'names', only their type names are returned.
- * @param $setting
+ * @param string $setting
  *   If set, only content types that have this setting activated are returned.
  *   Leave it NULL to get all content profile types.
  * @param $value

Indentation +230 added lines, -230 removed lines

@@ -11,56 +11,56 @@ 
  * Implementation of hook_init().
  */
 function content_profile_init() {
-  module_load_include('inc', 'content_profile', 'content_profile.theme_vars');
+    module_load_include('inc', 'content_profile', 'content_profile.theme_vars');
 }
 
 /**
  * Implementation of hook_ctools_plugin_directory().
  */
 function content_profile_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'relationships') {
+    if ($module == 'ctools' && $plugin == 'relationships') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_menu().
  */
 function content_profile_menu() {
-  $items = array();
+    $items = array();
 
-  //Register a path for each content profile type
-  foreach (content_profile_get_types('names') as $type => $typename) {
+    //Register a path for each content profile type
+    foreach (content_profile_get_types('names') as $type => $typename) {
     $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/edit'] = array(
-      'title' => 'Edit',
-      'type' => MENU_DEFAULT_LOCAL_TASK,
+        'title' => 'Edit',
+        'type' => MENU_DEFAULT_LOCAL_TASK,
     );
     $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/profile'] = array(
-      'title' => 'Content profile',
-      'description' => 'Configure the display and management of this content profile.',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('content_profile_admin_settings', $type),
-      'access callback' => 'user_access',
-      'access arguments' => array('administer nodes'),
-      'type' => MENU_LOCAL_TASK,
-      'weight' => 1,
+        'title' => 'Content profile',
+        'description' => 'Configure the display and management of this content profile.',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('content_profile_admin_settings', $type),
+        'access callback' => 'user_access',
+        'access arguments' => array('administer nodes'),
+        'type' => MENU_LOCAL_TASK,
+        'weight' => 1,
     );
-  }
-  foreach (content_profile_get_types('names') as $type => $type_name) {
+    }
+    foreach (content_profile_get_types('names') as $type => $type_name) {
     $items['user/%user/profile/'. $type] = array(
-      'title callback' => 'check_plain',
-      'title' => drupal_ucfirst($type_name),
-      'page callback' => 'content_profile_page_edit',
-      'page arguments' => array($type, 1),
-      'access callback' => 'content_profile_page_access',
-      'access arguments' => array($type, 1),
-      'weight' => content_profile_get_settings($type, 'weight'),
-      'file' => 'node.pages.inc',
-      'file path' => drupal_get_path('module', 'node'),
-      'type' => content_profile_get_settings($type, 'edit_tab') == 'top' ? MENU_LOCAL_TASK : MENU_CALLBACK,
+        'title callback' => 'check_plain',
+        'title' => drupal_ucfirst($type_name),
+        'page callback' => 'content_profile_page_edit',
+        'page arguments' => array($type, 1),
+        'access callback' => 'content_profile_page_access',
+        'access arguments' => array($type, 1),
+        'weight' => content_profile_get_settings($type, 'weight'),
+        'file' => 'node.pages.inc',
+        'file path' => drupal_get_path('module', 'node'),
+        'type' => content_profile_get_settings($type, 'edit_tab') == 'top' ? MENU_LOCAL_TASK : MENU_CALLBACK,
     );
-  }
-  return $items;
+    }
+    return $items;
 }
 
 /**
@@ -68,45 +68,45 @@ 
  * Take over menu items generated by the user module for our categories.
  */
 function content_profile_menu_alter(&$items) {
-  foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+    foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
     if (!empty($items['user/%user_category/edit/'. $type])) {
-      $item = &$items['user/%user_category/edit/'. $type];
-      $item = array(
+        $item = &$items['user/%user_category/edit/'. $type];
+        $item = array(
         'page callback' => 'content_profile_page_edit',
         'page arguments' => array($type, 1),
         'access callback' => 'content_profile_page_access',
         'access arguments' => array($type, 1),
         'file' => 'node.pages.inc',
         'file path' => drupal_get_path('module', 'node'),
-      ) + $item;
+        ) + $item;
+    }
     }
-  }
 }
 
 
 function content_profile_page_access($type, $account) {
-  if ($node = content_profile_load($type, $account->uid)) {
+    if ($node = content_profile_load($type, $account->uid)) {
     return node_access('update', $node);
-  }
-  // Else user may view the page when they are going to create their own profile
-  // or have permission to create it for others.
-  global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+    }
+    // Else user may view the page when they are going to create their own profile
+    // or have permission to create it for others.
+    global $user;
+    if ($user->uid == $account->uid || user_access('administer nodes') ){
     return node_access('create', $type);
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Presents a node editing or adding form for the given content profile.
  */
 function content_profile_page_edit($type, $account) {
-  drupal_set_title(check_plain($account->name));
-  $node = content_profile_load($type, $account->uid);
-  if (!$node) {
+    drupal_set_title(check_plain($account->name));
+    $node = content_profile_load($type, $account->uid);
+    if (!$node) {
     $node = array('uid' => $account->uid, 'name' => (isset($account->name) ? $account->name : ''), 'type' => $type, 'language' => '');
-  }
-  return drupal_get_form($type .'_node_form', $node);
+    }
+    return drupal_get_form($type .'_node_form', $node);
 }
 
 
@@ -114,10 +114,10 @@ 
  * Implementation of hook_views_api().
  */
 function content_profile_views_api() {
-  return array(
+    return array(
     'api' => 2,
     'path' => drupal_get_path('module', 'content_profile') .'/views',
-  );
+    );
 }
 
 
@@ -125,71 +125,71 @@ 
  * Menu callback; content profile settings.
  */
 function content_profile_admin_settings(&$form_state, $type) {
-  $form_state['type'] = $type;
+    $form_state['type'] = $type;
 
-  $form['weight'] = array(
+    $form['weight'] = array(
     '#type' => 'weight',
     '#title' => t("Weight"),
     '#default_value' => content_profile_get_settings($type, 'weight'),
     '#description' => t('The weight of content of this content type where ever they appear - this applies to the input form integration as well to the display integration.'),
     '#weight' => 5,
-  );
-  $form['display'] = array(
+    );
+    $form['display'] = array(
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
     '#description' => t('Customize the display of this content profile.'),
     '#collapsible' => TRUE,
-  );
-  $form['display']['user_display'] = array(
+    );
+    $form['display']['user_display'] = array(
     '#type' => 'radios',
     '#title' => t("User page display style"),
     '#default_value' => content_profile_get_settings($type, 'user_display'),
     '#options' => array(
-      0 => t("Don't display this content profile on the user account page"),
-      'link' => t('Display it as link to the profile content'),
-      'full' => t('Display the full content'),
-      'teaser' => t("Display the content's teaser"),
+        0 => t("Don't display this content profile on the user account page"),
+        'link' => t('Display it as link to the profile content'),
+        'full' => t('Display the full content'),
+        'teaser' => t("Display the content's teaser"),
     ),
-  );
-  $form['display']['edit_link'] = array(
+    );
+    $form['display']['edit_link'] = array(
     '#type' => 'checkbox',
     '#title' => t("Include an edit link to the display"),
     '#default_value' => content_profile_get_settings($type, 'edit_link'),
-  );
-  $form['display']['add_link'] = array(
+    );
+    $form['display']['add_link'] = array(
     '#type' => 'checkbox',
     '#title' => t("Show a link to the content profile creation page, if there is no profile."),
     '#default_value' => content_profile_get_settings($type, 'add_link'),
     '#description' => t("If selected and the user has no profile of this type yet, a link to add one is shown on the user page."),
-  );
-  $form['display']['edit_tab'] = array(
+    );
+    $form['display']['edit_tab'] = array(
     '#type' => 'radios',
     '#title' => t("Profile edit tab"),
     '#default_value' => content_profile_get_settings($type, 'edit_tab'),
     '#options' => array(
-      0 => t('None'),
-      'top' => t("Show a tab at the user's page"),
-      'sub' => t("Show a secondary tab below the user's edit tab"),
+        0 => t('None'),
+        'top' => t("Show a tab at the user's page"),
+        'sub' => t("Show a secondary tab below the user's edit tab"),
     ),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit'),
     '#weight' => 10,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 function content_profile_admin_settings_submit($form, &$form_state) {
-  $settings = content_profile_get_settings($form_state['type']);
-  foreach (content_profile_settings_info() as $setting => $default) {
+    $settings = content_profile_get_settings($form_state['type']);
+    foreach (content_profile_settings_info() as $setting => $default) {
     if (isset($form_state['values'][$setting])) {
-      $settings[$setting] = $form_state['values'][$setting];
+        $settings[$setting] = $form_state['values'][$setting];
+    }
     }
-  }
-  content_profile_set_settings($form_state['type'], $settings);
-  drupal_set_message('Your changes have been saved.');
-  menu_rebuild();
+    content_profile_set_settings($form_state['type'], $settings);
+    drupal_set_message('Your changes have been saved.');
+    menu_rebuild();
 }
 
 /**
@@ -198,10 +198,10 @@ 
  *   The node object or the node's type
  */
 function is_content_profile($type) {
-  if (is_object($type)) {
+    if (is_object($type)) {
     $type = $type->type;
-  }
-  return variable_get('content_profile_use_'. $type, FALSE);
+    }
+    return variable_get('content_profile_use_'. $type, FALSE);
 }
 
 /**
@@ -218,14 +218,14 @@ 
  *   The value to compare the given setting too.
  */
 function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
-  $types = array();
+    $types = array();
 
-  foreach (node_get_types($op) as $type => $info) {
+    foreach (node_get_types($op) as $type => $info) {
     if (is_content_profile($type) && (!isset($setting) || content_profile_get_settings($type, $setting) == $value)) {
-      $types[$type] = $info;
+        $types[$type] = $info;
     }
-  }
-  return $types;
+    }
+    return $types;
 }
 
 /**
@@ -233,79 +233,79 @@ 
  * Rename or delete the settings variable if a type changes.
  */
 function content_profile_node_type($op, $info) {
-  switch ($op) {
+    switch ($op) {
     case 'delete':
       variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
-      break;
+        variable_del('content_profile_'. $info->type);
+        break;
     case 'update':
       if (!empty($info->old_type) && $info->old_type != $info->type) {
         if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
+            $settings = variable_get('content_profile_'. $info->old_type, array());
+            variable_del('content_profile_use_'. $info->old_type);
+            variable_del('content_profile_'. $info->old_type);
+            variable_set('content_profile_use_'. $info->type, 1);
+            variable_set('content_profile_'. $info->type, $settings);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
  * Implementation of hook_form_alter().
  */
 function content_profile_form_alter(&$form, $form_state, $form_id) {
-  if ($form_id == 'node_type_form') {
+    if ($form_id == 'node_type_form') {
     $form['content_profile'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Content Profile'),
-      '#group' => 'additional_settings',
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
-      '#weight' => 32,
+        '#type' => 'fieldset',
+        '#title' => t('Content Profile'),
+        '#group' => 'additional_settings',
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#weight' => 32,
     );
     $form['content_profile']['content_profile_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+        '#type' => 'checkbox',
+        '#title' => t('Use this content type as a content profile for users'),
+        '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
     );
-  }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+    }
+    elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
-      $form['buttons']['preview']['#access'] = FALSE;
-      $form['buttons']['delete']['#access'] = FALSE;
-      $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
+        $form['buttons']['preview']['#access'] = FALSE;
+        $form['buttons']['delete']['#access'] = FALSE;
+        $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
     if (!empty($_GET['uid']) && ($uid = intval($_GET['uid'])) && ($user = user_load($uid))) {
-      $form['author']['name']['#default_value'] = $user->name;
+        $form['author']['name']['#default_value'] = $user->name;
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_user().
  */
 function content_profile_user($op, &$edit, &$account, $category = NULL) {
-  global $user;
+    global $user;
 
-  switch ($op) {
+    switch ($op) {
     case 'categories':
       $data = array();
-      foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+        foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
         $data[] = array(
-          'name' => $type,
-          'title' => drupal_ucfirst($type_name),
-          'weight' => content_profile_get_settings($type, 'weight') + 1,
+            'name' => $type,
+            'title' => drupal_ucfirst($type_name),
+            'weight' => content_profile_get_settings($type, 'weight') + 1,
         );
-      }
-      return $data;
+        }
+        return $data;
 
     case 'view':
       $account->content['content_profile'] = content_profile_show_profiles($account->uid);
-      break;
+        break;
 
     case 'delete':
       // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
@@ -315,11 +315,11 @@ 
 
         $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
         while ($node = db_fetch_object($result)) {
-          _content_profile_node_delete($node);
+            _content_profile_node_delete($node);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -333,42 +333,42 @@ 
  * "SELECT * FROM {node}" query) instead of just the $nid.
  */
 function _content_profile_node_delete($node) {
-  // Copied over from node_load(), so that node_invoke('delete') gets
-  // the fully extended node object, like modules would expect:
+    // Copied over from node_load(), so that node_invoke('delete') gets
+    // the fully extended node object, like modules would expect:
 
-  if ($node->nid) {
+    if ($node->nid) {
     // Call the node specific callback (if any) and piggy-back the
     // results to the node or overwrite some values.
     if ($extra = node_invoke($node, 'load')) {
-      foreach ($extra as $key => $value) {
+        foreach ($extra as $key => $value) {
         $node->$key = $value;
-      }
+        }
     }
     if ($extra = node_invoke_nodeapi($node, 'load')) {
-      foreach ($extra as $key => $value) {
+        foreach ($extra as $key => $value) {
         $node->$key = $value;
-      }
+        }
+    }
     }
-  }
 
-  // Copied over from node_delete():
+    // Copied over from node_delete():
 
-  db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
-  db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
 
-  // Call the node-specific callback (if any):
-  node_invoke($node, 'delete');
-  node_invoke_nodeapi($node, 'delete');
+    // Call the node-specific callback (if any):
+    node_invoke($node, 'delete');
+    node_invoke_nodeapi($node, 'delete');
 
-  // Clear the cache so an anonymous poster can see the node being deleted.
-  cache_clear_all();
+    // Clear the cache so an anonymous poster can see the node being deleted.
+    cache_clear_all();
 
-  // Remove this node from the search index if needed.
-  if (function_exists('search_wipe')) {
+    // Remove this node from the search index if needed.
+    if (function_exists('search_wipe')) {
     search_wipe($node->nid, 'node');
-  }
-  watchdog('content', '@type: deleted %title.', array('@type' => $node->type, '%title' => $node->title));
-  drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_types('name', $node), '%title' => $node->title)));
+    }
+    watchdog('content', '@type: deleted %title.', array('@type' => $node->type, '%title' => $node->title));
+    drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_types('name', $node), '%title' => $node->title)));
 }
 
 /**
@@ -376,30 +376,30 @@ 
  */
 function content_profile_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
 
-  if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
+    if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
     // Check if this nodetype already exists
     if ($nid = content_profile_profile_exists($node, $node->uid)) {
-      // This node already exists, redirect to edit page
-      drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
+        // This node already exists, redirect to edit page
+        drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
     }
-  }
-  elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
+    }
+    elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
     // Only validate if the user-name changed or we add a new node
     if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
-      return;
+        return;
     }
     //check whether the selected user has already a profile
     $uid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $node->name));
     if ($uid && content_profile_profile_exists($node, $uid)) {
-      form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+        form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+    }
     }
-  }
-  elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
+    elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
     // Make sure the translated profile belongs to the same user.
     $node->uid = $node->translation_source->uid;
     $node->name = $node->translation_source->name;
-  }
+    }
 }
 
 /**
@@ -412,11 +412,11 @@ 
  * @return If a node exists, the node id, FALSE else.
  */
 function content_profile_profile_exists($node, $uid) {
-  $query = "SELECT n.nid AS nid FROM {node} n WHERE n.type = '%s' AND n.uid = %d ";
-  if (module_exists('translation') && translation_supported_type($node->type)) {
+    $query = "SELECT n.nid AS nid FROM {node} n WHERE n.type = '%s' AND n.uid = %d ";
+    if (module_exists('translation') && translation_supported_type($node->type)) {
     $query .= "AND n.language = '%s'";
-  }
-  return db_result(db_query($query, $node->type, $uid, $node->language));
+    }
+    return db_result(db_query($query, $node->type, $uid, $node->language));
 }
 
 /**
@@ -428,19 +428,19 @@ 
  *   e.g. user_edit, register or weight.
  */
 function content_profile_get_settings($type, $return = 'all') {
-  $settings = variable_get('content_profile_'. $type, array());
-  $settings += content_profile_settings_info();
-  if ($return == 'all') {
+    $settings = variable_get('content_profile_'. $type, array());
+    $settings += content_profile_settings_info();
+    if ($return == 'all') {
     return $settings;
-  }
-  return $settings[$return];
+    }
+    return $settings[$return];
 }
 
 /**
  * Saves the content_profile settings of a content type.
  */
 function content_profile_set_settings($type, $settings) {
-  variable_set('content_profile_'. $type, $settings);
+    variable_set('content_profile_'. $type, $settings);
 }
 
 /**
@@ -448,7 +448,7 @@ 
  * and their default value.
  */
 function content_profile_settings_info() {
-  return module_invoke_all('content_profile_settings');
+    return module_invoke_all('content_profile_settings');
 }
 
 /**
@@ -457,13 +457,13 @@ 
  * Defines content profile settings and their default value.
  */
 function content_profile_content_profile_settings() {
-  return array(
+    return array(
     'weight' => 0,
     'user_display' => 'full',
     'edit_link' => 0,
     'edit_tab' => 'sub',
     'add_link' => 1,
-  );
+    );
 }
 
 /**
@@ -479,17 +479,17 @@ 
  *   Optional. If set, the cache is reset.
  */
 function content_profile_load($type, $uid, $lang = '', $reset = NULL) {
-  static $cache = array();
+    static $cache = array();
 
-  if (!isset($cache[$type][$uid][$lang]) || $reset) {
+    if (!isset($cache[$type][$uid][$lang]) || $reset) {
     $cache[$type][$uid][$lang] = FALSE;
     $params = array('type' => $type, 'uid' => $uid);
     if ($node = node_load($lang ? $params + array('language' => $lang) : $params, NULL, $reset)) {
-      $cache[$type][$uid][$lang] = $node->nid;
+        $cache[$type][$uid][$lang] = $node->nid;
     }
     return $node;
-  }
-  return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
+    }
+    return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
 }
 
 /**
@@ -498,19 +498,19 @@ 
  * Show node submission guidelines for content profile node forms.
  */
 function content_profile_help($path, $arg) {
-  if (preg_match('/user\/\%\/(profile|edit)\/(.*)/', $path, $matches)) {
+    if (preg_match('/user\/\%\/(profile|edit)\/(.*)/', $path, $matches)) {
     foreach (content_profile_get_types('names') as $type => $typename) {
-      if ($type == $matches[2]) {
+        if ($type == $matches[2]) {
         $node = content_profile_load($type, $arg[1]);
         if ($node) {
-          return node_help('node/%/edit', array(1 => $node->nid));
+            return node_help('node/%/edit', array(1 => $node->nid));
         }
         else {
-          return node_help('node/add/'. $type, array('node', 'add', $type));
+            return node_help('node/add/'. $type, array('node', 'add', $type));
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -518,14 +518,14 @@ 
  * that shows all content_profiles as configured by the admin.
  */
 function content_profile_show_profiles($uid) {
-  global $user;
+    global $user;
 
-  $content = array();
-  foreach (content_profile_get_types('names') as $type => $type_name) {
+    $content = array();
+    foreach (content_profile_get_types('names') as $type => $type_name) {
     $node = content_profile_load($type, $uid);
 
     if (($style = content_profile_get_settings($type, 'user_display')) && $node && node_access('view', $node)) {
-      $content['content_profile_'. $type] = array(
+        $content['content_profile_'. $type] = array(
         '#theme' => ($style == 'link') ? 'content_profile_display_link' : 'content_profile_display_view',
         '#edit_link' => content_profile_get_settings($type, 'edit_link'),
         '#uid' => $uid,
@@ -533,59 +533,59 @@ 
         '#content_type' => $type,
         '#weight' => content_profile_get_settings($type, 'weight'),
         '#suffix' => '<br />',
-      );
+        );
 
-      // Working around the bug described at http://drupal.org/node/302873
-      module_load_include('inc', 'content_profile', 'content_profile.theme');
+        // Working around the bug described at http://drupal.org/node/302873
+        module_load_include('inc', 'content_profile', 'content_profile.theme');
     }
     elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
-      $content['content_profile_'. $type] = array(
+        $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',
         '#uid' => $uid,
         '#content_type' => $type,
         '#weight' => content_profile_get_settings($type, 'weight'),
         '#suffix' => '<br />',
-      );
+        );
+    }
     }
-  }
-  if ($content) {
+    if ($content) {
     $content['#prefix'] = '<p id="content-profile-view">';
     $content['#suffix'] = '</p>';
-  }
-  return $content;
+    }
+    return $content;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function content_profile_theme() {
-  $return = array(
+    $return = array(
     'content_profile_display_view' => array(
-      'template'  => 'content_profile-display-view',
-      'arguments' => array('element' => NULL),
-      'file' => 'content_profile.theme.inc',
+        'template'  => 'content_profile-display-view',
+        'arguments' => array('element' => NULL),
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_add_link' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_link' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_tab_view' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_tab_edit' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
-  );
-  if (module_exists('pageroute')) {
+    );
+    if (module_exists('pageroute')) {
     $return['content_profile_pageroute_empty']  = array(
-      'arguments' => array('type_name' => NULL),
-    	'file' => 'content_profile.pageroute.inc',
+        'arguments' => array('type_name' => NULL),
+        'file' => 'content_profile.pageroute.inc',
     );
-  }
-  return $return;
+    }
+    return $return;
 }
 
 /**
@@ -594,7 +594,7 @@ 
  * $conf['content_profile_extra_templates'] in settings.php.
  */
 function content_profile_theme_registry_alter(&$items) {
-  $templates = array_merge(array(
+    $templates = array_merge(array(
     'author_pane',
     'comment',
     'node',
@@ -603,47 +603,47 @@ 
     'username',
     'user_profile',
     'user_signature',
-  ), variable_get('content_profile_extra_templates', array()));
+    ), variable_get('content_profile_extra_templates', array()));
 
-  foreach ($templates as $key) {
+    foreach ($templates as $key) {
     if (isset($items[$key])) {
-      $items[$key] += array('preprocess functions' => array());
-      $items[$key]['preprocess functions'][] = 'content_profile_template_preprocess';
+        $items[$key] += array('preprocess functions' => array());
+        $items[$key]['preprocess functions'][] = 'content_profile_template_preprocess';
+    }
     }
-  }
 }
 
 /**
  * Adds $content_profile variable if we can find a $uid.
  */
 function content_profile_template_preprocess(&$variables, $hook) {
-  // Search the uid
-  foreach (array('account_id', 'uid', 'account', 'node', 'comment', 'user') as $name) {
+    // Search the uid
+    foreach (array('account_id', 'uid', 'account', 'node', 'comment', 'user') as $name) {
     if (isset($variables[$name])) {
-      $uid = is_object($variables[$name]) ? $variables[$name]->uid : $variables[$name];
-      $variables['content_profile'] = new content_profile_theme_variables($uid);
-      break;
+        $uid = is_object($variables[$name]) ? $variables[$name]->uid : $variables[$name];
+        $variables['content_profile'] = new content_profile_theme_variables($uid);
+        break;
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_simpletest().
  */
 function content_profile_simpletest() {
-  // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
-  $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
-  return array_keys($tests);
+    // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
+    $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
+    return array_keys($tests);
 }
 
 /**
  * Implementation of hook_pageroute_info() for Pageroute integration.
  */
 function content_profile_pageroute_info() {
-  return array(
+    return array(
     'content_profile' => array(
-      'viewprofile' => 'content_profile.pageroute',
-      'editprofile' => 'content_profile.pageroute',
+        'viewprofile' => 'content_profile.pageroute',
+        'editprofile' => 'content_profile.pageroute',
     )
-  );
+    );
 }

Switch Indentation +37 added lines, -37 removed lines

@@ -234,21 +234,21 @@ 
  */
 function content_profile_node_type($op, $info) {
   switch ($op) {
-    case 'delete':
-      variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
-      break;
-    case 'update':
-      if (!empty($info->old_type) && $info->old_type != $info->type) {
-        if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
-        }
+  case 'delete':
+    variable_del('content_profile_use_'. $info->type);
+    variable_del('content_profile_'. $info->type);
+    break;
+  case 'update':
+    if (!empty($info->old_type) && $info->old_type != $info->type) {
+      if (is_content_profile($info->old_type)) {
+        $settings = variable_get('content_profile_'. $info->old_type, array());
+        variable_del('content_profile_use_'. $info->old_type);
+        variable_del('content_profile_'. $info->old_type);
+        variable_set('content_profile_use_'. $info->type, 1);
+        variable_set('content_profile_'. $info->type, $settings);
       }
-      break;
+    }
+    break;
   }
 }
 
@@ -292,33 +292,33 @@ 
   global $user;
 
   switch ($op) {
-    case 'categories':
-      $data = array();
-      foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
-        $data[] = array(
-          'name' => $type,
-          'title' => drupal_ucfirst($type_name),
-          'weight' => content_profile_get_settings($type, 'weight') + 1,
-        );
-      }
-      return $data;
+  case 'categories':
+    $data = array();
+    foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+      $data[] = array(
+        'name' => $type,
+        'title' => drupal_ucfirst($type_name),
+        'weight' => content_profile_get_settings($type, 'weight') + 1,
+      );
+    }
+    return $data;
 
-    case 'view':
-      $account->content['content_profile'] = content_profile_show_profiles($account->uid);
-      break;
+  case 'view':
+    $account->content['content_profile'] = content_profile_show_profiles($account->uid);
+    break;
 
-    case 'delete':
-      // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
-      if ($types = content_profile_get_types()) {
-        $condition = array_fill(0, count($types), "type = '%s'");
-        $arguments = array_merge(array_keys($types), array($account->uid));
+  case 'delete':
+    // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
+    if ($types = content_profile_get_types()) {
+      $condition = array_fill(0, count($types), "type = '%s'");
+      $arguments = array_merge(array_keys($types), array($account->uid));
 
-        $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
-        while ($node = db_fetch_object($result)) {
-          _content_profile_node_delete($node);
-        }
+      $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
+      while ($node = db_fetch_object($result)) {
+        _content_profile_node_delete($node);
       }
-      break;
+    }
+    break;
   }
 }
 

Spacing +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
  */
 function content_profile_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'relationships') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -31,11 +31,11 @@ 
 
   //Register a path for each content profile type
   foreach (content_profile_get_types('names') as $type => $typename) {
-    $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/edit'] = array(
+    $items['admin/content/node-type/'.str_replace('_', '-', $type).'/edit'] = array(
       'title' => 'Edit',
       'type' => MENU_DEFAULT_LOCAL_TASK,
     );
-    $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/profile'] = array(
+    $items['admin/content/node-type/'.str_replace('_', '-', $type).'/profile'] = array(
       'title' => 'Content profile',
       'description' => 'Configure the display and management of this content profile.',
       'page callback' => 'drupal_get_form',
@@ -47,7 +47,7 @@ 
     );
   }
   foreach (content_profile_get_types('names') as $type => $type_name) {
-    $items['user/%user/profile/'. $type] = array(
+    $items['user/%user/profile/'.$type] = array(
       'title callback' => 'check_plain',
       'title' => drupal_ucfirst($type_name),
       'page callback' => 'content_profile_page_edit',
@@ -69,8 +69,8 @@ 
  */
 function content_profile_menu_alter(&$items) {
   foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
-    if (!empty($items['user/%user_category/edit/'. $type])) {
-      $item = &$items['user/%user_category/edit/'. $type];
+    if (!empty($items['user/%user_category/edit/'.$type])) {
+      $item = &$items['user/%user_category/edit/'.$type];
       $item = array(
         'page callback' => 'content_profile_page_edit',
         'page arguments' => array($type, 1),
@@ -91,7 +91,7 @@ 
   // Else user may view the page when they are going to create their own profile
   // or have permission to create it for others.
   global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+  if ($user->uid == $account->uid || user_access('administer nodes')) {
     return node_access('create', $type);
   }
   return FALSE;
@@ -106,7 +106,7 @@ 
   if (!$node) {
     $node = array('uid' => $account->uid, 'name' => (isset($account->name) ? $account->name : ''), 'type' => $type, 'language' => '');
   }
-  return drupal_get_form($type .'_node_form', $node);
+  return drupal_get_form($type.'_node_form', $node);
 }
 
 
@@ -116,7 +116,7 @@ 
 function content_profile_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'content_profile') .'/views',
+    'path' => drupal_get_path('module', 'content_profile').'/views',
   );
 }
 
@@ -201,7 +201,7 @@ 
   if (is_object($type)) {
     $type = $type->type;
   }
-  return variable_get('content_profile_use_'. $type, FALSE);
+  return variable_get('content_profile_use_'.$type, FALSE);
 }
 
 /**
@@ -217,7 +217,7 @@ 
  * @param $value
  *   The value to compare the given setting too.
  */
-function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
+function content_profile_get_types($op = 'types', $setting = NULL, $value = TRUE) {
   $types = array();
 
   foreach (node_get_types($op) as $type => $info) {
@@ -235,17 +235,17 @@ 
 function content_profile_node_type($op, $info) {
   switch ($op) {
     case 'delete':
-      variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
+      variable_del('content_profile_use_'.$info->type);
+      variable_del('content_profile_'.$info->type);
       break;
     case 'update':
       if (!empty($info->old_type) && $info->old_type != $info->type) {
         if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
+          $settings = variable_get('content_profile_'.$info->old_type, array());
+          variable_del('content_profile_use_'.$info->old_type);
+          variable_del('content_profile_'.$info->old_type);
+          variable_set('content_profile_use_'.$info->type, 1);
+          variable_set('content_profile_'.$info->type, $settings);
         }
       }
       break;
@@ -268,15 +268,15 @@ 
     $form['content_profile']['content_profile_use'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+      '#default_value' => variable_get('content_profile_use_'.$form['#node_type']->type, FALSE),
     );
   }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+  elseif (isset($form['#node']) && $form['#node']->type.'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
       $form['buttons']['preview']['#access'] = FALSE;
       $form['buttons']['delete']['#access'] = FALSE;
-      $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
+      $form['#redirect'] = arg(2) == 'profile' ? 'user/'.$form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
     if (!empty($_GET['uid']) && ($uid = intval($_GET['uid'])) && ($user = user_load($uid))) {
@@ -313,7 +313,7 @@ 
         $condition = array_fill(0, count($types), "type = '%s'");
         $arguments = array_merge(array_keys($types), array($account->uid));
 
-        $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
+        $result = db_query("SELECT * FROM {node} WHERE (".implode(' OR ', $condition).") AND uid = %d", $arguments);
         while ($node = db_fetch_object($result)) {
           _content_profile_node_delete($node);
         }
@@ -380,7 +380,7 @@ 
     // Check if this nodetype already exists
     if ($nid = content_profile_profile_exists($node, $node->uid)) {
       // This node already exists, redirect to edit page
-      drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
+      drupal_goto('node/'.$nid.'/edit', 'destination=user/'.$node->uid);
     }
   }
   elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
@@ -428,7 +428,7 @@ 
  *   e.g. user_edit, register or weight.
  */
 function content_profile_get_settings($type, $return = 'all') {
-  $settings = variable_get('content_profile_'. $type, array());
+  $settings = variable_get('content_profile_'.$type, array());
   $settings += content_profile_settings_info();
   if ($return == 'all') {
     return $settings;
@@ -440,7 +440,7 @@ 
  * Saves the content_profile settings of a content type.
  */
 function content_profile_set_settings($type, $settings) {
-  variable_set('content_profile_'. $type, $settings);
+  variable_set('content_profile_'.$type, $settings);
 }
 
 /**
@@ -506,7 +506,7 @@ 
           return node_help('node/%/edit', array(1 => $node->nid));
         }
         else {
-          return node_help('node/add/'. $type, array('node', 'add', $type));
+          return node_help('node/add/'.$type, array('node', 'add', $type));
         }
       }
     }
@@ -525,7 +525,7 @@ 
     $node = content_profile_load($type, $uid);
 
     if (($style = content_profile_get_settings($type, 'user_display')) && $node && node_access('view', $node)) {
-      $content['content_profile_'. $type] = array(
+      $content['content_profile_'.$type] = array(
         '#theme' => ($style == 'link') ? 'content_profile_display_link' : 'content_profile_display_view',
         '#edit_link' => content_profile_get_settings($type, 'edit_link'),
         '#uid' => $uid,
@@ -538,8 +538,8 @@ 
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
     }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
-      $content['content_profile_'. $type] = array(
+    elseif (user_access('create '.$type.' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+      $content['content_profile_'.$type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',
         '#uid' => $uid,
@@ -580,7 +580,7 @@ 
     ),
   );
   if (module_exists('pageroute')) {
-    $return['content_profile_pageroute_empty']  = array(
+    $return['content_profile_pageroute_empty'] = array(
       'arguments' => array('type_name' => NULL),
     	'file' => 'content_profile.pageroute.inc',
     );
@@ -632,7 +632,7 @@ 
  */
 function content_profile_simpletest() {
   // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
-  $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
+  $tests = file_scan_directory(drupal_get_path('module', 'content_profile').'/tests', '\.test');
   return array_keys($tests);
 }
 

Braces +5 added lines, -10 removed lines

@@ -270,8 +270,7 @@ 
       '#title' => t('Use this content type as a content profile for users'),
       '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
     );
-  }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+  } elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
       $form['buttons']['preview']['#access'] = FALSE;
@@ -382,8 +381,7 @@ 
       // This node already exists, redirect to edit page
       drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
     }
-  }
-  elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
+  } elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
     // Only validate if the user-name changed or we add a new node
     if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
@@ -394,8 +392,7 @@ 
     if ($uid && content_profile_profile_exists($node, $uid)) {
       form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
     }
-  }
-  elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
+  } elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
     // Make sure the translated profile belongs to the same user.
     $node->uid = $node->translation_source->uid;
     $node->name = $node->translation_source->name;
@@ -504,8 +501,7 @@ 
         $node = content_profile_load($type, $arg[1]);
         if ($node) {
           return node_help('node/%/edit', array(1 => $node->nid));
-        }
-        else {
+        } else {
           return node_help('node/add/'. $type, array('node', 'add', $type));
         }
       }
@@ -537,8 +533,7 @@ 
 
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
-    }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+    } elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
       $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',

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

Doc Comments +4 added lines

@@ -10,6 +10,7 @@ 
 
 /**
  * Rewrite the forum administration page with our new access rules.
+ * @param boolean $is_container
  */
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
   $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
@@ -663,6 +664,8 @@ 
  * This is a multistep operation : we go through all nodes by packs of 20.
  * The batch processing engine interrupts processing and sends progress
  * feedback after 1 second execution time.
+ * @param integer $limit
+ * @param integer $count
  */
 function _forum_access_update_batch_operation($tid, $limit, $count, &$context) {
   if (empty($context['sandbox'])) {
@@ -693,6 +696,7 @@ 
 
 /**
  * Post-processing for forum_access_form_submit().
+ * @param boolean $success
  */
 function _forum_access_update_batch_finished($success, $results, $operations) {
   if ($success) {

Indentation +470 added lines, -470 removed lines

@@ -12,33 +12,33 @@ 
  * Rewrite the forum administration page with our new access rules.
  */
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
-  $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
-  if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
+    $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
+    if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
     drupal_access_denied();  // Deny access if the user doesn't have View access.
     module_invoke_all('exit');
     exit;
-  }
+    }
 
-  $roles = user_roles();
-  if (isset($tid)) {  // edit
+    $roles = user_roles();
+    if (isset($tid)) {  // edit
     $template_tid = variable_get('forum_access_default_template_tid', 0);
     $settings = _forum_access_get_settings($tid);
-  }
-  else {  // create
+    }
+    else {  // create
     $template_tid = variable_get('forum_access_new_template_tid', NULL);
     $settings = _forum_access_get_settings($template_tid);
-  }
-  $fa_priority = $settings['priority'];
+    }
+    $fa_priority = $settings['priority'];
 
-  $form['forum_access'] = array(
+    $form['forum_access'] = array(
     '#type' => 'fieldset',
     '#title' => t('Access control'),
     '#collapsible' => TRUE,
     '#tree' => TRUE,
-  );
+    );
 
-  $tr = 't';
-  $variables = array(
+    $tr = 't';
+    $variables = array(
     '!access_content'                 => '<em>'. l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
     '!access_comments'                => '<em>'. l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
     '!create_forum_topics'            => '<em>'. l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
@@ -51,368 +51,368 @@ 
     '!administer_comments'            => '<em>'. l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
     '!administer_forums'              => '<em>'. l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
     '!administer_nodes'               => '<em>'. l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
-  );
-  if (!$is_container) {
+    );
+    if (!$is_container) {
     $form['forum_access']['permissions'] = array(
-      '#type' => 'fieldset',
-      '#title' => $tr('Permissions information'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => $tr('Permissions information'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
     );
     $form['forum_access']['permissions'][] = array(
-      '#type' => 'markup',
-      '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
-                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
-                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
-                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
-                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
-                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
-                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
-                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables) .'</li></ul>'.
-                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables) .'</div>',
-    );
-  }
-
-  // Load a template:
-  $vid = _forum_access_get_vid();
-  $form['forum_access']['template'] = array(
-      '#type' => 'fieldset',
-      '#title' => $tr('Template'),
-      '#collapsible' => TRUE,
-      '#collapsed' => empty($template_tid),
-  );
-  $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
-  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['. t('Load') .']'));
-  $form['forum_access']['template']['load_button'] = array(
+        '#type' => 'markup',
+        '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
+                            t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
+                            t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
+                            t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
+                            t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
+                            t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
+                            t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
+                            t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables) .'</li></ul>'.
+                            t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables) .'</div>',
+    );
+    }
+
+    // Load a template:
+    $vid = _forum_access_get_vid();
+    $form['forum_access']['template'] = array(
+        '#type' => 'fieldset',
+        '#title' => $tr('Template'),
+        '#collapsible' => TRUE,
+        '#collapsed' => empty($template_tid),
+    );
+    $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
+    $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['. t('Load') .']'));
+    $form['forum_access']['template']['load_button'] = array(
     '#type' => 'button',
     '#name' => 'load_template',
     '#value' => t('Load'),
     '#submit' => FALSE,
-  );
-  $form['forum_access']['template']['template_tid'] = array(
+    );
+    $form['forum_access']['template']['template_tid'] = array(
     '#type' => 'value',
     '#value' => NULL,
-  );
-  $form['forum_access']['template']['select_by_default'] = array(
+    );
+    $form['forum_access']['template']['select_by_default'] = array(
     '#type' => 'checkbox',
     '#title' => t('Remember this selection.'),
     '#default_value' => FALSE,
-  );
-  $form['forum_access']['template']['load_for_new'] = array(
+    );
+    $form['forum_access']['template']['load_for_new'] = array(
     '#type' => 'checkbox',
     '#title' => t("Use the selected forum's settings as defaults for new forums and containers."),
     '#default_value' => FALSE,
-  );
-  $form['forum_access']['#after_build'][] = '_forum_access_forum_form_after_build';
+    );
+    $form['forum_access']['#after_build'][] = '_forum_access_forum_form_after_build';
 
-  // Column titles:
-  $form['forum_access']['headers']['view'] = array(
+    // Column titles:
+    $form['forum_access']['headers']['view'] = array(
     '#type' => 'item',
     '#prefix' => '<div class="forum-access-div">',
     '#title' => ($is_container ? t('View this container') : t('View this forum')),
     '#suffix' => '</div>',
-  );
-  $forum_vocabulary = taxonomy_vocabulary_load(_forum_access_get_vid());
-  $form['forum_access']['headers']['create'] = array(
+    );
+    $forum_vocabulary = taxonomy_vocabulary_load(_forum_access_get_vid());
+    $form['forum_access']['headers']['create'] = array(
     '#type' => 'item',
     '#prefix' => '<div class="forum-access-div" id="forum-access-div-container">',
     '#title' => t('See this container in the %Forums selection list', array('%Forums' => $forum_vocabulary->name)),
     '#suffix' => '</div>',
-  );
-  if (!$is_container) {
+    );
+    if (!$is_container) {
     $form['forum_access']['headers']['create'] = array(  // overwrite!
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Post in this forum'),
-      '#suffix' => '</div>',
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Post in this forum'),
+        '#suffix' => '</div>',
     );
     $form['forum_access']['headers']['comment_create'] = array(
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Comment on posts'),
-      '#suffix' => '</div>',
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Comment on posts'),
+        '#suffix' => '</div>',
     );
     $form['forum_access']['headers']['update'] = array(
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Edit posts'),
-      '#suffix' => '</div>',
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Edit posts'),
+        '#suffix' => '</div>',
     );
     $form['forum_access']['headers']['delete'] = array(
-      '#type' => 'item',
-      '#prefix' => '<div class="forum-access-div">',
-      '#title' => t('Delete posts'),
-      '#suffix' => '</div>',
-    );
-  }
-  $form['forum_access']['headers']['clearer'] = array(
-      '#value' => '<div class="forum-access-clearer"></div>',
-  );
+        '#type' => 'item',
+        '#prefix' => '<div class="forum-access-div">',
+        '#title' => t('Delete posts'),
+        '#suffix' => '</div>',
+    );
+    }
+    $form['forum_access']['headers']['clearer'] = array(
+        '#value' => '<div class="forum-access-clearer"></div>',
+    );
   
-  // Column content (checkboxes):
-  $form['forum_access']['view'] = array(
+    // Column content (checkboxes):
+    $form['forum_access']['view'] = array(
     '#type' => 'checkboxes',
     '#prefix' => '<div class="forum-access-div">',
     '#suffix' => '</div>',
     '#options' => $roles,
     '#default_value' => $settings['view'],
     '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
-  );
-  $form['forum_access']['create'] = array(
+    );
+    $form['forum_access']['create'] = array(
     '#type' => 'checkboxes',
     '#prefix' => '<div class="forum-access-div">',
     '#suffix' => '</div>',
     '#options' => $roles,
     '#default_value' => $settings['create'],
     '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
-  );
-  if (!$is_container) {
+    );
+    if (!$is_container) {
     $form['forum_access']['comment_create'] = array(
-      '#type' => 'checkboxes',
-      '#prefix' => '<div class="forum-access-div">',
-      '#suffix' => '</div>',
-      '#options' => $roles,
-      '#default_value' => $settings['comment_create'],
-      '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
+        '#type' => 'checkboxes',
+        '#prefix' => '<div class="forum-access-div">',
+        '#suffix' => '</div>',
+        '#options' => $roles,
+        '#default_value' => $settings['comment_create'],
+        '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
     );
     $form['forum_access']['update'] = array(
-      '#type' => 'checkboxes',
-      '#prefix' => '<div class="forum-access-div">',
-      '#suffix' => '</div>',
-      '#options' => $roles,
-      '#default_value' => $settings['update'],
-      '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
+        '#type' => 'checkboxes',
+        '#prefix' => '<div class="forum-access-div">',
+        '#suffix' => '</div>',
+        '#options' => $roles,
+        '#default_value' => $settings['update'],
+        '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
     );
     $form['forum_access']['delete'] = array(
-      '#type' => 'checkboxes',
-      '#prefix' => '<div class="forum-access-div">',
-      '#suffix' => '</div>',
-      '#options' => $roles,
-      '#default_value' => $settings['delete'],
-      '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
-    );
-  }
-  $form['forum_access']['clearer'] = array(
+        '#type' => 'checkboxes',
+        '#prefix' => '<div class="forum-access-div">',
+        '#suffix' => '</div>',
+        '#options' => $roles,
+        '#default_value' => $settings['delete'],
+        '#process' => array('expand_checkboxes', '_forum_access_forum_form_disable_checkboxes'),
+    );
+    }
+    $form['forum_access']['clearer'] = array(
     '#type' => 'item',
     '#prefix' => '<div class="forum-access-clearer">',
     '#suffix' => '</div>',
     '#description' => t('For explanations of special cases, hover your mouse over role names.'),
-  );
-  if ($is_container) {
+    );
+    if ($is_container) {
     $form['forum_access']['container_note'] = array(
-      '#type' => 'item',
-      '#description' => t('Users who can see any forum or container within this one should get the <strong><em>View</em></strong> grant. <br /> Users who can post to a forum within this container should get the <strong><em>See</em></strong> grant, so that this forum appears in the proper context in the selection list.', $variables),
+        '#type' => 'item',
+        '#description' => t('Users who can see any forum or container within this one should get the <strong><em>View</em></strong> grant. <br /> Users who can post to a forum within this container should get the <strong><em>See</em></strong> grant, so that this forum appears in the proper context in the selection list.', $variables),
     );
-  }
+    }
 
-  drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
+    drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
 
-  // Find our moderator ACL:
-  if (isset($tid)) {  // edit, not new
+    // Find our moderator ACL:
+    if (isset($tid)) {  // edit, not new
     $acl_id = acl_get_id_by_number('forum_access', $tid);
     if (!$acl_id) { // create one
-      $acl_id = acl_create_new_acl('forum_access', NULL, $tid);
-      // update every existing node in this forum to use this acl.
-      $result = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $tid);
-      while ($node = db_fetch_object($result)) {
+        $acl_id = acl_create_new_acl('forum_access', NULL, $tid);
+        // update every existing node in this forum to use this acl.
+        $result = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $tid);
+        while ($node = db_fetch_object($result)) {
         // all privs to this ACL.
         acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
-      }
+        }
     }
     $form['forum_access']['acl'] = acl_edit_form($acl_id, t('Moderators'));
     $form['forum_access']['acl'][] = array(
-      '#type' => 'markup',
-      '#value' => '<div>'. t('Moderators receive all grants above.') .'</div>',
-      '#weight' => -1,
+        '#type' => 'markup',
+        '#value' => '<div>'. t('Moderators receive all grants above.') .'</div>',
+        '#weight' => -1,
     );
     $form['forum_access']['acl']['note'] = array(
-      '#type' => 'markup',
-      '#value' => '<div>'. t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))) .'</div>',
+        '#type' => 'markup',
+        '#value' => '<div>'. t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))) .'</div>',
     );
     $form['forum_access']['acl']['#after_build'][] = '_forum_access_forum_form_after_build_acl0';
     $form['forum_access']['acl']['#after_build'] = array_reverse($form['forum_access']['acl']['#after_build']);
     $form['forum_access']['acl']['#after_build'][] = '_forum_access_forum_form_after_build_acl2';
-  }
+    }
 
-  foreach (module_implements('node_access_records') as $module) {
+    foreach (module_implements('node_access_records') as $module) {
     $na_modules[$module] = $module;
-  }
-  unset($na_modules['forum_access']);
-  unset($na_modules['acl']);
-  if (count($na_modules) && !$is_container) {
+    }
+    unset($na_modules['forum_access']);
+    unset($na_modules['acl']);
+    if (count($na_modules) && !$is_container) {
     $form['forum_access']['interference'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Module interference'),
-      '#collapsible' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('Module interference'),
+        '#collapsible' => TRUE,
     );
     $variables = array(
-      '%content_type' => node_get_types('name', 'forum'),
-      '!Forum_Access' => 'Forum Access',
-      '!Content_Access' => l('Content Access', 'http://drupal.org/project/content_access'),
-      '@Content_Access' => 'Content Access',
-      '!ACL' => 'ACL',
-      '!module_list' => '<ul><li>'. implode($na_modules, '</li><li>') .'</li></ul>',
+        '%content_type' => node_get_types('name', 'forum'),
+        '!Forum_Access' => 'Forum Access',
+        '!Content_Access' => l('Content Access', 'http://drupal.org/project/content_access'),
+        '@Content_Access' => 'Content Access',
+        '!ACL' => 'ACL',
+        '!module_list' => '<ul><li>'. implode($na_modules, '</li><li>') .'</li></ul>',
     );
     $form['forum_access']['interference'][] = array(
-      '#type' => 'item',
-      '#value' => '<p>'. t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables) .'</p>',
-      '#description' => t('Forums can contain other content types besides %content_type; !Forum_Access will contribute the grants defined above to every node in this forum, but other node access control modules may also contribute their grants, especially to nodes of types other than %content_type.', $variables),
+        '#type' => 'item',
+        '#value' => '<p>'. t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables) .'</p>',
+        '#description' => t('Forums can contain other content types besides %content_type; !Forum_Access will contribute the grants defined above to every node in this forum, but other node access control modules may also contribute their grants, especially to nodes of types other than %content_type.', $variables),
     );
 
     if (module_exists('content_access')) {
-      $ca_settings = variable_get('content_access_settings', array());
-      foreach (array('view', 'update', 'delete', 'per_node') as $type) {
+        $ca_settings = variable_get('content_access_settings', array());
+        foreach (array('view', 'update', 'delete', 'per_node') as $type) {
         $value = content_access_get_settings($type, 'forum');
         if (!empty($value)) {
-          $ca_interferes = TRUE;
+            $ca_interferes = TRUE;
+        }
         }
-      }
-      $ca_priority = content_access_get_settings('priority', 'forum');
-      $is_conflict = $ca_priority >= $fa_priority && !empty($ca_interferes) || $ca_priority > $fa_priority;
-      $variables += array(
+        $ca_priority = content_access_get_settings('priority', 'forum');
+        $is_conflict = $ca_priority >= $fa_priority && !empty($ca_interferes) || $ca_priority > $fa_priority;
+        $variables += array(
         '!link' => l(t('@Content_Access configuration for the %content_type type', $variables), 'admin/content/node-type/forum/access', array('html' => TRUE)),
         '%Advanced' => $tr('Advanced'),
-      );
-      $specifically = ($ca_priority == $fa_priority ? t('Specifically, any grants given by !Content_Access cannot be taken back by !Forum_Access.', $variables) : '');
-      if ($is_conflict) {
+        );
+        $specifically = ($ca_priority == $fa_priority ? t('Specifically, any grants given by !Content_Access cannot be taken back by !Forum_Access.', $variables) : '');
+        if ($is_conflict) {
         $form['forum_access']['interference']['by_content_access'] = array(
-          '#type' => 'fieldset',
-          '#title' => 'Content Access',
-          '#collapsible' => FALSE,
-          '#attributes' => array('class' => 'error'),
+            '#type' => 'fieldset',
+            '#title' => 'Content Access',
+            '#collapsible' => FALSE,
+            '#attributes' => array('class' => 'error'),
         );
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables) ." $specifically</div>",
+            '#value' => '<div>'. t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables) ." $specifically</div>",
         );
         if ($ca_priority == $fa_priority) {
-          $form['forum_access']['interference']['by_content_access'][] = array(
+            $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
-          );
+            );
         }
         else {
-          $form['forum_access']['interference']['by_content_access'][] = array(
+            $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
-          );
+            );
         }
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
+            '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
         );
-      }
-      else {
+        }
+        else {
         $form['forum_access']['interference'][] = array(
-          '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
+            '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
         );
-      }
+        }
     }
 
     $form['forum_access']['interference']['advanced'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Advanced'),
-      '#collapsible' => TRUE,
-      '#collapsed' => !($fa_priority != 0),
+        '#type' => 'fieldset',
+        '#title' => t('Advanced'),
+        '#collapsible' => TRUE,
+        '#collapsed' => !($fa_priority != 0),
     );
     $form['forum_access']['interference']['advanced']['priority'] = array(
-      '#type' => 'weight',
-      '#title' => t('Priority of !Forum_Access node grants in this forum', $variables),
-      '#default_value' => $fa_priority,
-      '#description' => t("If you have no other node access control modules installed, you should leave this at the default 0. <br /> Otherwise you can raise or lower the priority of !Forum_Access' grants. Out of all the grants contributed to a node, only those with the highest priority are used, and all others are discarded.", $variables),
+        '#type' => 'weight',
+        '#title' => t('Priority of !Forum_Access node grants in this forum', $variables),
+        '#default_value' => $fa_priority,
+        '#description' => t("If you have no other node access control modules installed, you should leave this at the default 0. <br /> Otherwise you can raise or lower the priority of !Forum_Access' grants. Out of all the grants contributed to a node, only those with the highest priority are used, and all others are discarded.", $variables),
     );
-  }
+    }
 
-  if (!$is_container) {
+    if (!$is_container) {
     $variables = array(
-      '!Forum_Access'        => l('Forum Access', 'http://drupal.org/project/forum_access'),
-      '!ACL'                 => l('ACL', 'http://drupal.org/project/acl'),
-      '%Module_interference' => t('Module interference'),
-      '!Forum_Access-dev'    => l('Forum&nbsp;Access&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96795', array('html' => TRUE)),
-      '!ACL-dev'             => l('ACL&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96794', array('html' => TRUE)),
-      '%devel_node_access'   => 'devel_node_access',
-      '!Devel'               => l('Devel', 'http://drupal.org/project/devel'),
-      '!DNA'                 => 'DNA',
-      '!debug_mode'          => l('debug mode', 'admin/settings/devel', array('fragment' => 'edit-devel-node-access-debug-mode')),
-      '!dna_summary'         => l('devel/node_access/summary', 'devel/node_access/summary'),
-      '!Rebuild_permissions' => '['. $tr('Rebuild permissions') .']',
-      '!Post_settings_link'  => l('admin/content/node-settings', 'admin/content/node-settings'),
-      '!Forum_Access_'       => l('Forum Access', 'http://drupal.org/project/issues/forum_access'),
-      '!ACL_'                => l('ACL', 'http://drupal.org/project/issues/acl'),
+        '!Forum_Access'        => l('Forum Access', 'http://drupal.org/project/forum_access'),
+        '!ACL'                 => l('ACL', 'http://drupal.org/project/acl'),
+        '%Module_interference' => t('Module interference'),
+        '!Forum_Access-dev'    => l('Forum&nbsp;Access&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96795', array('html' => TRUE)),
+        '!ACL-dev'             => l('ACL&nbsp;6.x-1.x-dev', 'http://drupal.org/node/96794', array('html' => TRUE)),
+        '%devel_node_access'   => 'devel_node_access',
+        '!Devel'               => l('Devel', 'http://drupal.org/project/devel'),
+        '!DNA'                 => 'DNA',
+        '!debug_mode'          => l('debug mode', 'admin/settings/devel', array('fragment' => 'edit-devel-node-access-debug-mode')),
+        '!dna_summary'         => l('devel/node_access/summary', 'devel/node_access/summary'),
+        '!Rebuild_permissions' => '['. $tr('Rebuild permissions') .']',
+        '!Post_settings_link'  => l('admin/content/node-settings', 'admin/content/node-settings'),
+        '!Forum_Access_'       => l('Forum Access', 'http://drupal.org/project/issues/forum_access'),
+        '!ACL_'                => l('ACL', 'http://drupal.org/project/issues/acl'),
     );
     $form['forum_access']['troubleshooting'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Trouble-shooting node access'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('Trouble-shooting node access'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
     );
     $form['forum_access']['troubleshooting'][] = array(
-      '#type' => 'item',
-      '#value' => '<div>'.    t("In case of problems, follow these steps until you've got it worked out:") .'<ol style="margin-top: 0"><li>'.
-                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables) .'</li><li>'.
+        '#type' => 'item',
+        '#value' => '<div>'.    t("In case of problems, follow these steps until you've got it worked out:") .'<ol style="margin-top: 0"><li>'.
+                                t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables) .'</li><li>'.
         (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables) .'</li><li>' : '') .
-                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables) .'</li><li>'.
-                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables) .'</li><li>'.
-                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables) .'</li><li>'.
-                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables) .'</li><li>'.
-                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables) .'</li><li>'.
-                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.") .'</li></ol></div>',
+                                t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables) .'</li><li>'.
+                                t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables) .'</li><li>'.
+                                t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables) .'</li><li>'.
+                                t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables) .'</li><li>'.
+                                t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables) .'</li><li>'.
+                                t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.") .'</li></ol></div>',
     );
     $form['forum_access']['troubleshooting'][] = array(
-      '#type' => 'item',
-      '#value' => '<div>'. t("Note: You should not keep the !Devel module enabled on a production site.", $variables) .'</div>',
+        '#type' => 'item',
+        '#value' => '<div>'. t("Note: You should not keep the !Devel module enabled on a production site.", $variables) .'</div>',
     );
-  }
+    }
 
-  if (!$is_container && isset($tid) && !node_access_needs_rebuild()) {
+    if (!$is_container && isset($tid) && !node_access_needs_rebuild()) {
     $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
     $limit = 20;   // from _node_access_rebuild_batch_operation()
     $threshold = variable_get('forum_access_batch_threshold', $limit);  // change the variable if you want
     $form['forum_access']['update_limit'] = array(
-      '#type' => 'value',
-      '#value' => $limit,
+        '#type' => 'value',
+        '#value' => $limit,
     );
     $form['forum_access']['update_choice'] = array(
-      '#type' => 'radios',
-      '#title' => 'Update the permissions',
-      '#description' => t('<em>If</em> you make any node access changes, then each node in this forum needs to be updated. Hover over the radiobuttons for details.'),
-      '#options' => NULL,
-      0 => array(
+        '#type' => 'radios',
+        '#title' => 'Update the permissions',
+        '#description' => t('<em>If</em> you make any node access changes, then each node in this forum needs to be updated. Hover over the radiobuttons for details.'),
+        '#options' => NULL,
+        0 => array(
         '#type' => 'radio',
         '#title' => t('for all %count nodes immediately', array('%count' => $count)),
         '#attributes' => array('title' => t('This option is the fastest, but with many nodes it can still take considerable time and memory. If it fails, it will leave your !node_access table in an inconsistent state.', array('!node_access' => '{node_access}'))),
         '#return_value' => 0,
         '#default_value' => ($count <= $threshold ? 0 : 1),
         '#parents' => array('forum_access', 'update_choice'),
-      ),
-      1 => array(
+        ),
+        1 => array(
         '#type' => 'radio',
         '#title' => t('in batches of !limit now', array('!limit' => $limit)),
         '#attributes' => array('title' => t('The batch option will always work reliably, but it takes longer to complete.')),
         '#return_value' => 1,
         '#default_value' => ($count <= $threshold ? 0 : 1),
         '#parents' => array('forum_access', 'update_choice'),
-      ),
-      2 => array(
+        ),
+        2 => array(
         '#type' => 'radio',
         '#title' => t('rebuild <strong>all</strong> permissions later'),
         '#attributes' => array('title' => t("This option will only set a flag to remind you to rebuild all permissions later; this is useful if you want to make multiple changes to your node access settings quickly and delay the updating until you're done.")),
         '#return_value' => 2,
         '#default_value' => ($count <= $threshold ? 0 : 1),
         '#parents' => array('forum_access', 'update_choice'),
-      ),
-      '#attributes' => array('class' => 'forum-access-flowed'),
+        ),
+        '#attributes' => array('class' => 'forum-access-flowed'),
     );
-  }
-  if (isset($tid)) {
+    }
+    if (isset($tid)) {
     $form['forum_access']['force_update'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Update even if unchanged'),
+        '#type' => 'checkbox',
+        '#title' => t('Update even if unchanged'),
     );
-  }
+    }
 
-  // Move some stuff down so our block goes in a nice place.
-  $form['submit']['#weight'] = 10;
-  $form['delete']['#weight'] = 10;
+    // Move some stuff down so our block goes in a nice place.
+    $form['submit']['#weight'] = 10;
+    $form['delete']['#weight'] = 10;
 
-  $form['#validate'][] = '_forum_access_form_validate';
-  $form['#submit'][] = '_forum_access_form_submit';
+    $form['#validate'][] = '_forum_access_form_validate';
+    $form['#submit'][] = '_forum_access_form_submit';
 }
 
 /**
@@ -420,82 +420,82 @@ 
  * are the permissions of the corresponding role.
  */
 function _forum_access_get_role_permissions() {
-  static $permissions;
-  if (empty($permissions)) {
+    static $permissions;
+    if (empty($permissions)) {
     $permissions[DRUPAL_AUTHENTICATED_RID] = array();
     $result = db_query('SELECT r.rid, p.perm FROM {role} r INNER JOIN {permission} p ON r.rid = p.rid ORDER BY r.rid');
     while ($role = db_fetch_object($result)) {
-      $permissions[$role->rid] = ($role->rid == DRUPAL_ANONYMOUS_RID ? array() : $permissions[DRUPAL_AUTHENTICATED_RID]);
-      $permissions[$role->rid] += array_flip(explode(', ', $role->perm));
+        $permissions[$role->rid] = ($role->rid == DRUPAL_ANONYMOUS_RID ? array() : $permissions[DRUPAL_AUTHENTICATED_RID]);
+        $permissions[$role->rid] += array_flip(explode(', ', $role->perm));
+    }
     }
-  }
-  return $permissions;
+    return $permissions;
 }
 
 function _forum_access_forum_form_disable_checkboxes($element) {
-  global $user;
-  $tr = 't';
-  $moderator_rid = forum_access_query_moderator_rid();
+    global $user;
+    $tr = 't';
+    $moderator_rid = forum_access_query_moderator_rid();
 
-  $permissions = _forum_access_get_role_permissions();
-  $element_children = element_children($element);
-  foreach ($element_children as $rid) {
+    $permissions = _forum_access_get_role_permissions();
+    $element_children = element_children($element);
+    foreach ($element_children as $rid) {
     if ($rid == $moderator_rid) {
-      $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
-      $element[$rid]['#suffix'] = "</span>";
-      $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#disabled'] = TRUE;
+        $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
+        $element[$rid]['#suffix'] = "</span>";
+        $element[$rid]['#default_value'] = TRUE;
+        $element[$rid]['#disabled'] = TRUE;
     }
     elseif ($element['#parents'][1] == 'create') {
-      // Do nothing (Post is always mutable).
+        // Do nothing (Post is always mutable).
     }
     elseif ($element['#parents'][1] == 'comment_create') {
     }
     elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
-      $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
-      $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
-      if (isset($permissions[$rid]['administer nodes'])) {
+        $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
+        $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
+        if (isset($permissions[$rid]['administer nodes'])) {
         $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
-      }
-      $element[$rid]['#suffix'] = "</span>";
+        }
+        $element[$rid]['#suffix'] = "</span>";
     }
     elseif (isset($permissions[$rid]['administer nodes'])) {
-      $element[$rid]['#disabled'] = TRUE;
-      $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
+        $element[$rid]['#disabled'] = TRUE;
+        $element[$rid]['#default_value'] = TRUE;
+        $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
                                                     ? t("This role has the '@administer_nodes' permission and thus full access to all nodes.", array('@administer_nodes' => $tr('administer nodes')))
                                                     : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))) .'">';
-      $element[$rid]['#suffix'] = "</span>";
+        $element[$rid]['#suffix'] = "</span>";
+    }
     }
-  }
-  return $element;
+    return $element;
 }
 
 function _forum_access_forum_form_after_build_acl0($form, $form_state) {
-  if (isset($form['#post']['forum_access']['template']['taxonomy'])) {
+    if (isset($form['#post']['forum_access']['template']['taxonomy'])) {
     // Get ACL's user_list for the template and replace it before ACL's after_build function gets its shot at it.
     $imv = array_values($form['#post']['forum_access']['template']['taxonomy']);
     $template_tid = reset($imv);
     if ($acl_id = acl_get_id_by_number('forum_access', $template_tid)) {
-      $f = acl_edit_form($acl_id, 'DUMMY');
-      $form['user_list']['#value'] = $f['user_list']['#default_value'];
+        $f = acl_edit_form($acl_id, 'DUMMY');
+        $form['user_list']['#value'] = $f['user_list']['#default_value'];
     }
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function _forum_access_forum_form_after_build_acl2($form, $form_state) {
-  if (!count(unserialize($form['user_list']['#default_value'])) && !count(unserialize($form['user_list']['#value']))) {
+    if (!count(unserialize($form['user_list']['#default_value'])) && !count(unserialize($form['user_list']['#value']))) {
     $form['#collapsed'] = TRUE;
-  }
-  if ($form['user_list']['#default_value'] != $form['user_list']['#value']) {
+    }
+    if ($form['user_list']['#default_value'] != $form['user_list']['#value']) {
     $form['note']['#value'] = preg_replace('/<div>/', '<div class="warning">', $form['note']['#value']);
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function _forum_access_forum_form_after_build($form, &$form_state) {
-  if (isset($form_state['clicked_button']['#name']) && $form_state['clicked_button']['#name'] == $form['template']['load_button']['#name']) {
+    if (isset($form_state['clicked_button']['#name']) && $form_state['clicked_button']['#name'] == $form['template']['load_button']['#name']) {
     // Load a setting from a template:
     $template_tid = reset(array_values($form['#post']['forum_access']['template']['taxonomy']));
     $form_state['values']['forum_access']['template']['template_tid'] = $template_tid;
@@ -503,158 +503,158 @@ 
 
     $settings = _forum_access_get_settings($template_tid);
     foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
-      if (empty($form[$grant_type])) {
+        if (empty($form[$grant_type])) {
         continue;
-      }
-      foreach (element_children($form[$grant_type]) as $tid) {
+        }
+        foreach (element_children($form[$grant_type]) as $tid) {
         $checked = array_search($tid, $settings[$grant_type]) !== FALSE;
         $form[$grant_type][$tid]['#value'] = ($checked ? $tid : 0);
-      }
+        }
     }
     $form['interference']['advanced']['priority']['#value'] = $settings['priority'];
     if ($settings['priority'] != 0) {
-      $form['interference']['advanced']['#collapsed'] = FALSE;
+        $form['interference']['advanced']['#collapsed'] = FALSE;
     }
-  }
-  elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
-      $imv = reset($form_state['values']['forum_access']['template']['taxonomy']);
+    }
+    elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
+        $imv = reset($form_state['values']['forum_access']['template']['taxonomy']);
     $template_tid = reset($imv);
-  }
-  if (isset($template_tid)) {
+    }
+    if (isset($template_tid)) {
     $form['template']['select_by_default']['#value'] = ($template_tid && $template_tid == variable_get('forum_access_default_template_tid', 0));
     $form['template']['load_for_new']['#value'] = ($template_tid && $template_tid == variable_get('forum_access_new_template_tid', 0));
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function _forum_access_form_validate($form, &$form_state) {
-  global $user;
+    global $user;
 
-  if ($user->uid == 1) {
+    if ($user->uid == 1) {
     return;
-  }
-  $access = $form_state['values']['forum_access']; // shortcut
-  foreach ($access['view'] as $rid => $checked) {
+    }
+    $access = $form_state['values']['forum_access']; // shortcut
+    foreach ($access['view'] as $rid => $checked) {
     if ($checked && isset($user->roles[$rid])) {
-      return;
+        return;
+    }
     }
-  }
-  form_set_error('forum_access][view', t('You must assign %View access to a role that you hold.', array('%View' => 'View')));
+    form_set_error('forum_access][view', t('You must assign %View access to a role that you hold.', array('%View' => 'View')));
 }
 
 function _forum_access_form_submit($form, &$form_state) {
-  $access = $form_state['values']['forum_access']; // shortcut
+    $access = $form_state['values']['forum_access']; // shortcut
 
-  // Save template choice:
-  $template_tid = reset(array_values($access['template']['taxonomy']));
-  if ($access['template']['select_by_default']) {
+    // Save template choice:
+    $template_tid = reset(array_values($access['template']['taxonomy']));
+    if ($access['template']['select_by_default']) {
     variable_set('forum_access_default_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
+    }
+    elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
     variable_del('forum_access_default_template_tid');
-  }
-  if ($access['template']['load_for_new']) {
+    }
+    if ($access['template']['load_for_new']) {
     variable_set('forum_access_new_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
+    }
+    elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
     variable_del('forum_access_new_template_tid');
-  }
-  module_load_include('node.inc', 'forum_access');
-  $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
-
-  // check for changes
-  $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
-  $is_changed = $is_changed || !empty($access['force_update']);
-  $form_initial_values = $form;  // avoid Coder warning
-  $form_initial_values = $form_initial_values['forum_access'];
-  foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
+    }
+    module_load_include('node.inc', 'forum_access');
+    $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
+
+    // check for changes
+    $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
+    $is_changed = $is_changed || !empty($access['force_update']);
+    $form_initial_values = $form;  // avoid Coder warning
+    $form_initial_values = $form_initial_values['forum_access'];
+    foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
     if (isset($form_initial_values[$grant_type])) {
-      $defaults = $form_initial_values[$grant_type]['#default_value'];
-      $defaults = array_flip($defaults);
-      foreach ($access[$grant_type] as $rid => $checked) {
+        $defaults = $form_initial_values[$grant_type]['#default_value'];
+        $defaults = array_flip($defaults);
+        foreach ($access[$grant_type] as $rid => $checked) {
         $is_changed = $is_changed || (empty($form_initial_values[$grant_type][$rid]['#disabled']) && !empty($checked) != isset($defaults[$rid]));
-      }
+        }
+    }
     }
-  }
-  if (!$is_changed && $access['acl']['user_list'] == $form_initial_values['acl']['user_list']['#default_value'] && $access['interference']['advanced']['priority'] == $form_initial_values['interference']['advanced']['priority']['#default_value']) {
+    if (!$is_changed && $access['acl']['user_list'] == $form_initial_values['acl']['user_list']['#default_value'] && $access['interference']['advanced']['priority'] == $form_initial_values['interference']['advanced']['priority']['#default_value']) {
     drupal_set_message(t('The content access permissions are unchanged.'));
     return;
-  }
+    }
 
-  $tid = $form_state['values']['tid'];
-  db_query("DELETE FROM {forum_access} WHERE tid = %d", $tid);
+    $tid = $form_state['values']['tid'];
+    db_query("DELETE FROM {forum_access} WHERE tid = %d", $tid);
 
-  $fa_priority = isset($access['interference']['advanced']['priority']) ? $access['interference']['advanced']['priority'] : 0;
-  if (array_key_exists('acl', $access)) {
+    $fa_priority = isset($access['interference']['advanced']['priority']) ? $access['interference']['advanced']['priority'] : 0;
+    if (array_key_exists('acl', $access)) {
     $moderators = unserialize($access['acl']['user_list']);
     acl_save_form($access['acl'], $fa_priority);
-  }
-  $permissions = _forum_access_get_role_permissions();
-  foreach ($access['view'] as $rid => $checked) {
+    }
+    $permissions = _forum_access_get_role_permissions();
+    foreach ($access['view'] as $rid => $checked) {
     if ($rid == $moderator_rid) {
-      continue;
+        continue;
     }
     if (isset($permissions[$rid]['administer nodes'])) {
-      // We prefer not to save records for node administrators, because these have access anyway.
-      if (isset($permissions[$rid]['administer forums']) && $access['view'][$rid]) {
+        // We prefer not to save records for node administrators, because these have access anyway.
+        if (isset($permissions[$rid]['administer forums']) && $access['view'][$rid]) {
         // For forum administrators, View needs to be saved, ...
-      }
-      else {
+        }
+        else {
         // ... otherwise forget View.
         $access['view'][$rid] = FALSE;
-      }
-      if ($access['view'][$rid] || $access['create'][$rid] || $access['comment_create'][$rid]) {
+        }
+        if ($access['view'][$rid] || $access['create'][$rid] || $access['comment_create'][$rid]) {
         db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
         $tid, $rid, !empty($access['view'][$rid]), 0, 0, !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
-      }
+        }
     }
     else {
-      db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
-      $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
+        db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
+        $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
-  }
-  $tr = 't';
-  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'. $tid);
-  watchdog('access', 'Changed grants for %forum forum.', array('%forum' => $form_state['values']['name']), WATCHDOG_NOTICE, $link);
+    }
+    $tr = 't';
+    $link = l($tr('edit'), 'admin/content/forum/edit/forum/'. $tid);
+    watchdog('access', 'Changed grants for %forum forum.', array('%forum' => $form_state['values']['name']), WATCHDOG_NOTICE, $link);
 
-  if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
+    if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
     if (!isset($access['update_choice']) || $access['update_choice'] == 2) {
-      node_access_needs_rebuild(TRUE);
+        node_access_needs_rebuild(TRUE);
     }
     elseif ($access['update_choice'] == 0) {
-      // update immediately (but use the batch functions anyway
-      $save_redirect = $form_state['redirect'];
-      $form_state['redirect'] = $_GET['q'];
-      $context = array();
-      $pending_error_messages = drupal_get_messages('error', FALSE);
-      $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
-      _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
-      _forum_access_update_batch_operation($tid, 999999, 1, $context);
-      $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
-      unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
-      foreach ($pending_error_messages['error'] as $message) {            // replay any others
+        // update immediately (but use the batch functions anyway
+        $save_redirect = $form_state['redirect'];
+        $form_state['redirect'] = $_GET['q'];
+        $context = array();
+        $pending_error_messages = drupal_get_messages('error', FALSE);
+        $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
+        _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
+        _forum_access_update_batch_operation($tid, 999999, 1, $context);
+        $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
+        unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
+        foreach ($pending_error_messages['error'] as $message) {            // replay any others
         drupal_set_message($message, 'error');
-      }
-      _forum_access_update_batch_finished(TRUE, array(), array());
-      $form_state['redirect'] = $save_redirect;
+        }
+        _forum_access_update_batch_finished(TRUE, array(), array());
+        $form_state['redirect'] = $save_redirect;
     }
     else {
-      // mass update in batch mode, modeled after node.module
-      $limit = $access['update_limit'];
-      $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
-      $batch = array(
+        // mass update in batch mode, modeled after node.module
+        $limit = $access['update_limit'];
+        $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
+        $batch = array(
         'title' => t('Updating content access permissions'),
         'file' => drupal_get_path('module', 'forum_access') .'/forum_access.admin.inc',
         'operations' => array(
-          array('_forum_access_update_batch_operation', array($tid, $limit, $count)),
+            array('_forum_access_update_batch_operation', array($tid, $limit, $count)),
         ),
         'finished' => '_forum_access_update_batch_finished'
-      );
-      batch_set($batch);
+        );
+        batch_set($batch);
+    }
     }
-  }
 
-  variable_del('forum_access_rids');  // clear cache
+    variable_del('forum_access_rids');  // clear cache
 }
 
 /**
@@ -665,73 +665,73 @@ 
  * feedback after 1 second execution time.
  */
 function _forum_access_update_batch_operation($tid, $limit, $count, &$context) {
-  if (empty($context['sandbox'])) {
+    if (empty($context['sandbox'])) {
     // Initiate multistep processing.
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['current_node'] = 0;
     $context['sandbox']['max'] = $count;
-  }
+    }
 
-  // Process the next 20 nodes.
-  $result = db_query_range("SELECT DISTINCT n.nid FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE n.nid > %d AND tn.tid = %d ORDER BY n.nid ASC", $context['sandbox']['current_node'], $tid, 0, $limit);
-  while ($row = db_fetch_array($result)) {
+    // Process the next 20 nodes.
+    $result = db_query_range("SELECT DISTINCT n.nid FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE n.nid > %d AND tn.tid = %d ORDER BY n.nid ASC", $context['sandbox']['current_node'], $tid, 0, $limit);
+    while ($row = db_fetch_array($result)) {
     $loaded_node = node_load($row['nid'], NULL, TRUE);
     // To preserve database integrity, only aquire grants if the node
     // loads successfully.
     if (!empty($loaded_node)) {
-      node_access_acquire_grants($loaded_node);
+        node_access_acquire_grants($loaded_node);
     }
     $context['sandbox']['progress']++;
     $context['sandbox']['current_node'] = $loaded_node->nid;
-  }
+    }
 
-  // Multistep processing : report progress.
-  if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
+    // Multistep processing : report progress.
+    if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Post-processing for forum_access_form_submit().
  */
 function _forum_access_update_batch_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     drupal_set_message(t('The content access permissions have been updated.'));
     cache_clear_all();
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('The content access permissions have not been properly updated.'), 'error');
-  }
+    }
 }
 
 /**
  * Add our settings to the forum administration settings page.
  */
 function _forum_access_forum_admin_settings_form(&$form, &$form_state) {
-  $variables = array(
+    $variables = array(
     '!Forum_Access' => 'Forum Access',
     '%View' => 'View',
     '%Post' => 'Post',
     '%post_comments' => 'post comments',
-  );
-  $form['forum_access'] = array(
+    );
+    $form['forum_access'] = array(
     '#type' => 'fieldset',
     '#title' => 'Forum Access',
     '#attributes' => array('id' => 'edit-forum-admin-settings-forum-access'),
-  );
-  $form['forum_access']['note'] = array(
+    );
+    $form['forum_access']['note'] = array(
     '#type'          => 'item',
     '#value'         => t('Note: All other !Forum_Access controls are on the administration pages of the individual forums.', $variables),
-  );
-  $form['forum_access']['forum_access_D5_legacy_mode'] = array(
+    );
+    $form['forum_access']['forum_access_D5_legacy_mode'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Drupal 5 legacy mode', $variables),
     '#default_value' => variable_get('forum_access_D5_legacy_mode', FALSE),
     '#description'   => t('In Drupal 5, comment posting was not restricted by !Forum_Access; users with %View access (and the %post_comments permission) were always allowed to post forum comments. Starting with Drupal 6, posting comments is now restricted to users with %Post access. Turn this option on to revert to the old behavior. The default is OFF.', $variables),
-  );
-  $buttons = $form['buttons'];
-  unset($form['buttons']);
-  $form['buttons'] = $buttons;
+    );
+    $buttons = $form['buttons'];
+    unset($form['buttons']);
+    $form['buttons'] = $buttons;
 }
 
 /**
@@ -739,63 +739,63 @@ 
  */
 function _forum_access_get_settings($tid = NULL) {
     $return = array('view' => array(), 'create' => array(), 'comment_create' => array(), 'update' => array(), 'delete' => array(), 'priority' => 0);
-  if (!isset($tid)) {
+    if (!isset($tid)) {
     // Default to all users can read; all logged in users can post and comment.
     $return['view'] = array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID);
     $return['create'] = array(DRUPAL_AUTHENTICATED_RID);
     $return['comment_create'] = array(DRUPAL_AUTHENTICATED_RID);
-  }
-  else {
+    }
+    else {
     $result = db_query("SELECT * FROM {forum_access} where tid = %d", $tid);
     while ($access = db_fetch_object($result)) {
-      if ($access->grant_view) {
+        if ($access->grant_view) {
         $return['view'][] = $access->rid;
-      }
-      if ($access->grant_update) {
+        }
+        if ($access->grant_update) {
         $return['update'][] = $access->rid;
-      }
-      if ($access->grant_delete) {
+        }
+        if ($access->grant_delete) {
         $return['delete'][] = $access->rid;
-      }
-      if ($access->grant_create) {
+        }
+        if ($access->grant_create) {
         $return['create'][] = $access->rid;
-      }
-      if ($access->grant_comment_create) {
+        }
+        if ($access->grant_comment_create) {
         $return['comment_create'][] = $access->rid;
-      }
-      if ($access->rid == DRUPAL_AUTHENTICATED_RID) {  // this is our reference
+        }
+        if ($access->rid == DRUPAL_AUTHENTICATED_RID) {  // this is our reference
         $return['priority'] = $access->priority;
-      }
+        }
+    }
     }
-  }
-  return $return;
+    return $return;
 }
 
 /**
  * Remove unusable 'edit' links from overview form.
  */
 function _forum_access_forum_overview(&$form, &$form_state) {
-  global $user;
-  if ($user->uid == 1) {
+    global $user;
+    if ($user->uid == 1) {
     return;
-  }
-  foreach ($form as $key => $value) {
+    }
+    foreach ($form as $key => $value) {
     if (preg_match('/^tid:(.*):0$/', $key, $matches)) {
-      if (!forum_access_access($matches[1], 'view', NULL, FALSE)) {
+        if (!forum_access_access($matches[1], 'view', NULL, FALSE)) {
         $form[$key]['edit']['#access'] = FALSE;
         if (preg_match('|<a [^>]*>([^<]*)</a>|', $form[$key]['view']['#value'], $matches)) {
-          $form[$key]['view']['#value'] = $matches[1];
+            $form[$key]['view']['#value'] = $matches[1];
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
  * We must know when a role is deleted.
  */
 function _forum_access_user_admin_role_form(&$form, &$form_state) {
-  $form['#submit'][] = '_forum_access_user_admin_role_submit';
+    $form['#submit'][] = '_forum_access_user_admin_role_submit';
 }
 
 /**
@@ -803,14 +803,14 @@ 
  * Also, we complain if the Forum Moderator role is deleted.
  */
 function _forum_access_user_admin_role_submit($form, &$form_state) {
-  if ($form_state['values']['op'] == $form_state['values']['delete']) {
+    if ($form_state['values']['op'] == $form_state['values']['delete']) {
     $rid = $form_state['values']['rid'];
     db_query("DELETE FROM {forum_access} WHERE rid = %d", $rid);
     db_query("DELETE FROM {node_access} WHERE gid = %d AND realm = 'forum_access'", $rid);
     if ($rid === forum_access_query_moderator_rid()) {
-      drupal_set_message(t('The role you have just deleted is required by !Forum_Access; it will be recreated automatically.', array('!Forum_Access' => 'Forum Access')), 'error');
+        drupal_set_message(t('The role you have just deleted is required by !Forum_Access; it will be recreated automatically.', array('!Forum_Access' => 'Forum Access')), 'error');
+    }
     }
-  }
 }
 
 /**
@@ -818,27 +818,27 @@ 
  * to control the same content types as we do.
  */
 function _forum_access_content_access_admin_form() {
-  $tr = 't';
-  $variables = array(
+    $tr = 't';
+    $variables = array(
     '!Content_Access' => 'Content Access',
     '!Forum_Access' => 'Forum Access',
     '!Forum_Access_link' => l('Forum Access', 'admin/content/forum'),
     '%anonymous_user' => $tr('anonymous user'),
     '%authenticated_user' => $tr('authenticated user'),
     '%Advanced' => $tr('Advanced'),
-  );
-  if (arg(3) == 'forum') {
+    );
+    if (arg(3) == 'forum') {
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
-      .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
-      .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
-  }
-  else {
+        .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
+        .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
+    }
+    else {
     $vid = _forum_access_get_vid();
     $vocabulary = taxonomy_vocabulary_load($vid);
     if (isset($vocabulary->nodes[arg(3)])) {
-      drupal_set_message(t('Note: Nodes of this content type can be put inside forums, where access to them will also be controlled by !Forum_Access.<br />In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected on the !Forum_Access_link settings, and vice versa, but any node access module can only allow <i>more</i> access, not less.', $variables), 'warning');
+        drupal_set_message(t('Note: Nodes of this content type can be put inside forums, where access to them will also be controlled by !Forum_Access.<br />In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected on the !Forum_Access_link settings, and vice versa, but any node access module can only allow <i>more</i> access, not less.', $variables), 'warning');
+    }
     }
-  }
 }
 
 /**
@@ -848,12 +848,12 @@ 
  * admin/user/permissions.
  */
 function _forum_access_user_admin_perm_form(&$form, &$form_state) {
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid) && array_key_exists($moderator_rid, $form['role_names'])) {
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid) && array_key_exists($moderator_rid, $form['role_names'])) {
     drupal_set_message(t('The %role role is used internally by the @Forum_Access module and must not be changed!', array('%role' => $form['role_names'][$moderator_rid]['#value'], '@Forum_Access' => 'Forum Access')), 'warning', FALSE);
     $form['checkboxes'][$moderator_rid]['#disabled'] = TRUE;
-  }
-  array_unshift($form['#submit'], '_forum_access_user_admin_perm_form_submit');
+    }
+    array_unshift($form['#submit'], '_forum_access_user_admin_perm_form_submit');
 }
 
 /**
@@ -863,10 +863,10 @@ 
  * before the real handler gets them.
  */
 function _forum_access_user_admin_perm_form_submit($form, &$form_state) {
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid)) {
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid)) {
     unset($form_state['values'][$moderator_rid]);
-  }
+    }
 }
 
 /**
@@ -876,10 +876,10 @@ 
  * admin/user/user.
  */
 function _forum_access_user_admin_account_form(&$form, &$form_state) {
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid)) {
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid)) {
     unset($form['options']['operation']['#options'][t('Add a role to the selected users')]["add_role-$moderator_rid"]);
-  }
+    }
 }
 
 /**
@@ -888,54 +888,54 @@ 
  * Disable the Forum Moderator checkbox on user/UID/edit.
  */
 function _forum_access_user_profile_form(&$form, &$form_state) {
-  //dpm($form, '_forum_access_user_profile_form()');
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($moderator_rid) && isset($form['account']['roles']['#options'][$moderator_rid])) {
+    //dpm($form, '_forum_access_user_profile_form()');
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($moderator_rid) && isset($form['account']['roles']['#options'][$moderator_rid])) {
     $form['account']['roles'][$moderator_rid] = array(
-      '#type' => 'checkbox',
-      '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
-      '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
-      '#disabled' => TRUE,
+        '#type' => 'checkbox',
+        '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
+        '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
+        '#disabled' => TRUE,
     );
     unset($form['account']['roles']['#options'][$moderator_rid]);
-  }
+    }
 }
 
 /**
  * Create the Forum Moderator role.
  */
 function _forum_access_create_moderator_rid($verbose = FALSE) {
-  $tr = 't';
-  $variables = array('!Forum_Access' => 'Forum Access', '%administer_comments' => $tr('administer comments'), '%administer_nodes' => $tr('administer nodes'));
-  $role_name = t('Forum Moderator');
-  $role = new stdClass();
-  $role->name = $role_name;
-  for ($i = 2; $i <= 12; ++$i) {
+    $tr = 't';
+    $variables = array('!Forum_Access' => 'Forum Access', '%administer_comments' => $tr('administer comments'), '%administer_nodes' => $tr('administer nodes'));
+    $role_name = t('Forum Moderator');
+    $role = new stdClass();
+    $role->name = $role_name;
+    for ($i = 2; $i <= 12; ++$i) {
     $variables['%role'] = $role->name;
     if (!db_result(db_query("SELECT COUNT(rid) FROM {role} WHERE name = '%s'", $role->name)) &&
         drupal_write_record('role', $role)) {
-      $rid = $role->rid;
-      variable_set('forum_access_moderator_rid', $rid);
-      $permission = new stdClass();
-      $permission->rid = $rid;
-      $permission->perm = 'administer comments, administer nodes, post comments, post comments without approval';
-      drupal_write_record('permission', $permission);
-      $msg = t('!Forum_Access has created a new role named %role and given it the %administer_nodes and %administer_comments permissions. This role is used internally by !Forum_Access. You can change the name of the role as you like, but you must keep it unmodified otherwise.', $variables);
-      if ($verbose) {
+        $rid = $role->rid;
+        variable_set('forum_access_moderator_rid', $rid);
+        $permission = new stdClass();
+        $permission->rid = $rid;
+        $permission->perm = 'administer comments, administer nodes, post comments, post comments without approval';
+        drupal_write_record('permission', $permission);
+        $msg = t('!Forum_Access has created a new role named %role and given it the %administer_nodes and %administer_comments permissions. This role is used internally by !Forum_Access. You can change the name of the role as you like, but you must keep it unmodified otherwise.', $variables);
+        if ($verbose) {
         drupal_set_message($msg, 'warning');
-      }
-      watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
-      return $rid;
+        }
+        watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
+        return $rid;
     }
     else {
-      $msg = t('!Forum_Access cannot create the %role role!', $variables);
-      watchdog('user', $msg, NULL, WATCHDOG_WARNING);
-      drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
-      $role->name = $role_name .' '. $i;
-    }
-  }
-  $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);
-  drupal_set_message($msg, 'error');
-  watchdog('user', $msg, NULL, WATCHDOG_CRITICAL);
+        $msg = t('!Forum_Access cannot create the %role role!', $variables);
+        watchdog('user', $msg, NULL, WATCHDOG_WARNING);
+        drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
+        $role->name = $role_name .' '. $i;
+    }
+    }
+    $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);
+    drupal_set_message($msg, 'error');
+    watchdog('user', $msg, NULL, WATCHDOG_CRITICAL);
 }
 

Spacing +67 added lines, -67 removed lines

@@ -14,7 +14,7 @@ 
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
   $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
   if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
-    drupal_access_denied();  // Deny access if the user doesn't have View access.
+    drupal_access_denied(); // Deny access if the user doesn't have View access.
     module_invoke_all('exit');
     exit;
   }
@@ -39,18 +39,18 @@ 
 
   $tr = 't';
   $variables = array(
-    '!access_content'                 => '<em>'. l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
-    '!access_comments'                => '<em>'. l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!create_forum_topics'            => '<em>'. l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!post_comments'                  => '<em>'. l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!post_comments_without_approval' => '<em>'. l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!edit_own_forum_topics'          => '<em>'. l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!edit_any_forum_topics'          => '<em>'. l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_own_forum_topics'        => '<em>'. l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_any_forum_topics'        => '<em>'. l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_comments'            => '<em>'. l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!administer_forums'              => '<em>'. l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_nodes'               => '<em>'. l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
+    '!access_content'                 => '<em>'.l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)).'</em>',
+    '!access_comments'                => '<em>'.l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!create_forum_topics'            => '<em>'.l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!post_comments'                  => '<em>'.l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!post_comments_without_approval' => '<em>'.l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!edit_own_forum_topics'          => '<em>'.l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!edit_any_forum_topics'          => '<em>'.l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!delete_own_forum_topics'        => '<em>'.l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!delete_any_forum_topics'        => '<em>'.l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!administer_comments'            => '<em>'.l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!administer_forums'              => '<em>'.l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!administer_nodes'               => '<em>'.l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)).'</em>',
   );
   if (!$is_container) {
     $form['forum_access']['permissions'] = array(
@@ -61,15 +61,15 @@ 
     );
     $form['forum_access']['permissions'][] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
-                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
-                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
-                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
-                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
-                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
-                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
-                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables) .'</li></ul>'.
-                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables) .'</div>',
+      '#value' => '<div>'.t('Note that users need').'<ul style="margin-top: 0"><li>'.
+                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables).'</li><li>'.
+                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables).'</li><li>'.
+                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'.t('Drupal 5 legacy mode').'"' : 'strong'))).'</li><li>'.
+                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables).'</li><li>'.
+                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables).'</li><li>'.
+                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables).'</li><li>'.
+                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables).'</li></ul>'.
+                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables).'</div>',
     );
   }
 
@@ -82,7 +82,7 @@ 
       '#collapsed' => empty($template_tid),
   );
   $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
-  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['. t('Load') .']'));
+  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['.t('Load').']'));
   $form['forum_access']['template']['load_button'] = array(
     '#type' => 'button',
     '#name' => 'load_template',
@@ -205,7 +205,7 @@ 
     );
   }
 
-  drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
+  drupal_add_css(drupal_get_path('module', 'forum_access').'/forum_access.css');
 
   // Find our moderator ACL:
   if (isset($tid)) {  // edit, not new
@@ -222,12 +222,12 @@ 
     $form['forum_access']['acl'] = acl_edit_form($acl_id, t('Moderators'));
     $form['forum_access']['acl'][] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Moderators receive all grants above.') .'</div>',
+      '#value' => '<div>'.t('Moderators receive all grants above.').'</div>',
       '#weight' => -1,
     );
     $form['forum_access']['acl']['note'] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))) .'</div>',
+      '#value' => '<div>'.t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))).'</div>',
     );
     $form['forum_access']['acl']['#after_build'][] = '_forum_access_forum_form_after_build_acl0';
     $form['forum_access']['acl']['#after_build'] = array_reverse($form['forum_access']['acl']['#after_build']);
@@ -251,11 +251,11 @@ 
       '!Content_Access' => l('Content Access', 'http://drupal.org/project/content_access'),
       '@Content_Access' => 'Content Access',
       '!ACL' => 'ACL',
-      '!module_list' => '<ul><li>'. implode($na_modules, '</li><li>') .'</li></ul>',
+      '!module_list' => '<ul><li>'.implode($na_modules, '</li><li>').'</li></ul>',
     );
     $form['forum_access']['interference'][] = array(
       '#type' => 'item',
-      '#value' => '<p>'. t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables) .'</p>',
+      '#value' => '<p>'.t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables).'</p>',
       '#description' => t('Forums can contain other content types besides %content_type; !Forum_Access will contribute the grants defined above to every node in this forum, but other node access control modules may also contribute their grants, especially to nodes of types other than %content_type.', $variables),
     );
 
@@ -282,25 +282,25 @@ 
           '#attributes' => array('class' => 'error'),
         );
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables) ." $specifically</div>",
+          '#value' => '<div>'.t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables)." $specifically</div>",
         );
         if ($ca_priority == $fa_priority) {
           $form['forum_access']['interference']['by_content_access'][] = array(
-            '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
+            '#value' => '<div>'.t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables).'</div>',
           );
         }
         else {
           $form['forum_access']['interference']['by_content_access'][] = array(
-            '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
+            '#value' => '<div>'.t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables).'</div>',
           );
         }
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
+          '#value' => '<div>'.t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables).'</div>',
         );
       }
       else {
         $form['forum_access']['interference'][] = array(
-          '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
+          '#value' => '<p>'.t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables).'</p>',
         );
       }
     }
@@ -331,7 +331,7 @@ 
       '!DNA'                 => 'DNA',
       '!debug_mode'          => l('debug mode', 'admin/settings/devel', array('fragment' => 'edit-devel-node-access-debug-mode')),
       '!dna_summary'         => l('devel/node_access/summary', 'devel/node_access/summary'),
-      '!Rebuild_permissions' => '['. $tr('Rebuild permissions') .']',
+      '!Rebuild_permissions' => '['.$tr('Rebuild permissions').']',
       '!Post_settings_link'  => l('admin/content/node-settings', 'admin/content/node-settings'),
       '!Forum_Access_'       => l('Forum Access', 'http://drupal.org/project/issues/forum_access'),
       '!ACL_'                => l('ACL', 'http://drupal.org/project/issues/acl'),
@@ -344,26 +344,26 @@ 
     );
     $form['forum_access']['troubleshooting'][] = array(
       '#type' => 'item',
-      '#value' => '<div>'.    t("In case of problems, follow these steps until you've got it worked out:") .'<ol style="margin-top: 0"><li>'.
-                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables) .'</li><li>'.
-        (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables) .'</li><li>' : '') .
-                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables) .'</li><li>'.
-                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables) .'</li><li>'.
-                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables) .'</li><li>'.
-                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables) .'</li><li>'.
-                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables) .'</li><li>'.
-                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.") .'</li></ol></div>',
+      '#value' => '<div>'.t("In case of problems, follow these steps until you've got it worked out:").'<ol style="margin-top: 0"><li>'.
+                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables).'</li><li>'.
+        (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables).'</li><li>' : '').
+                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables).'</li><li>'.
+                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables).'</li><li>'.
+                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables).'</li><li>'.
+                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables).'</li><li>'.
+                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables).'</li><li>'.
+                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.").'</li></ol></div>',
     );
     $form['forum_access']['troubleshooting'][] = array(
       '#type' => 'item',
-      '#value' => '<div>'. t("Note: You should not keep the !Devel module enabled on a production site.", $variables) .'</div>',
+      '#value' => '<div>'.t("Note: You should not keep the !Devel module enabled on a production site.", $variables).'</div>',
     );
   }
 
   if (!$is_container && isset($tid) && !node_access_needs_rebuild()) {
     $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
-    $limit = 20;   // from _node_access_rebuild_batch_operation()
-    $threshold = variable_get('forum_access_batch_threshold', $limit);  // change the variable if you want
+    $limit = 20; // from _node_access_rebuild_batch_operation()
+    $threshold = variable_get('forum_access_batch_threshold', $limit); // change the variable if you want
     $form['forum_access']['update_limit'] = array(
       '#type' => 'value',
       '#value' => $limit,
@@ -441,7 +441,7 @@ 
   $element_children = element_children($element);
   foreach ($element_children as $rid) {
     if ($rid == $moderator_rid) {
-      $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
+      $element[$rid]['#prefix'] = '<span title="'.t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')).'" class="forum-access-temporary-moderator">';
       $element[$rid]['#suffix'] = "</span>";
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#disabled'] = TRUE;
@@ -452,19 +452,19 @@ 
     elseif ($element['#parents'][1] == 'comment_create') {
     }
     elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
-      $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
-      $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
+      $element[$rid]['#title'] = '<em>'.$element[$rid]['#title'].'</em>';
+      $element[$rid]['#prefix'] = '<span title="'.t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))).'">';
       if (isset($permissions[$rid]['administer nodes'])) {
-        $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
+        $element[$rid]['#prefix'] = str_replace('">', ' '.t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))).'">', $element[$rid]['#prefix']);
       }
       $element[$rid]['#suffix'] = "</span>";
     }
     elseif (isset($permissions[$rid]['administer nodes'])) {
       $element[$rid]['#disabled'] = TRUE;
       $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
+      $element[$rid]['#prefix'] = '<span title="'.($rid != $moderator_rid
                                                     ? t("This role has the '@administer_nodes' permission and thus full access to all nodes.", array('@administer_nodes' => $tr('administer nodes')))
-                                                    : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))) .'">';
+                                                    : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))).'">';
       $element[$rid]['#suffix'] = "</span>";
     }
   }
@@ -560,12 +560,12 @@ 
     variable_del('forum_access_new_template_tid');
   }
   module_load_include('node.inc', 'forum_access');
-  $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
+  $moderator_rid = _forum_access_get_moderator_rid(TRUE); // create the moderators role if it doesn't exist
 
   // check for changes
   $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
   $is_changed = $is_changed || !empty($access['force_update']);
-  $form_initial_values = $form;  // avoid Coder warning
+  $form_initial_values = $form; // avoid Coder warning
   $form_initial_values = $form_initial_values['forum_access'];
   foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
     if (isset($form_initial_values[$grant_type])) {
@@ -610,11 +610,11 @@ 
     }
     else {
       db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
-      $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
+      $tid, $rid, (bool)$checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
   }
   $tr = 't';
-  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'. $tid);
+  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'.$tid);
   watchdog('access', 'Changed grants for %forum forum.', array('%forum' => $form_state['values']['name']), WATCHDOG_NOTICE, $link);
 
   if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
@@ -628,10 +628,10 @@ 
       $context = array();
       $pending_error_messages = drupal_get_messages('error', FALSE);
       $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
-      _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
+      _forum_access_update_batch_finished(FALSE, array(), array()); // add our error message (in case we die underway)
       _forum_access_update_batch_operation($tid, 999999, 1, $context);
-      $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
-      unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
+      $pending_error_messages = drupal_get_messages('error', TRUE); // still alive, get and clear all 'error' messages
+      unset($pending_error_messages['error'][$our_error_message_index]); // remove our error message
       foreach ($pending_error_messages['error'] as $message) {            // replay any others
         drupal_set_message($message, 'error');
       }
@@ -644,7 +644,7 @@ 
       $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
       $batch = array(
         'title' => t('Updating content access permissions'),
-        'file' => drupal_get_path('module', 'forum_access') .'/forum_access.admin.inc',
+        'file' => drupal_get_path('module', 'forum_access').'/forum_access.admin.inc',
         'operations' => array(
           array('_forum_access_update_batch_operation', array($tid, $limit, $count)),
         ),
@@ -654,7 +654,7 @@ 
     }
   }
 
-  variable_del('forum_access_rids');  // clear cache
+  variable_del('forum_access_rids'); // clear cache
 }
 
 /**
@@ -687,7 +687,7 @@ 
 
   // Multistep processing : report progress.
   if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -829,8 +829,8 @@ 
   );
   if (arg(3) == 'forum') {
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
-      .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
-      .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
+      .'<br /><span class="error">'.t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables).'</span>'
+      .'<br />'.t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
   }
   else {
     $vid = _forum_access_get_vid();
@@ -893,7 +893,7 @@ 
   if (isset($moderator_rid) && isset($form['account']['roles']['#options'][$moderator_rid])) {
     $form['account']['roles'][$moderator_rid] = array(
       '#type' => 'checkbox',
-      '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
+      '#title' => $form['account']['roles']['#options'][$moderator_rid].' ('.t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')).')',
       '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
       '#disabled' => TRUE,
     );
@@ -930,8 +930,8 @@ 
     else {
       $msg = t('!Forum_Access cannot create the %role role!', $variables);
       watchdog('user', $msg, NULL, WATCHDOG_WARNING);
-      drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
-      $role->name = $role_name .' '. $i;
+      drupal_set_message($msg.' '.t('Is it already in use?'), 'error');
+      $role->name = $role_name.' '.$i;
     }
   }
   $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);

Braces +18 added lines, -36 removed lines

@@ -23,8 +23,7 @@ 
   if (isset($tid)) {  // edit
     $template_tid = variable_get('forum_access_default_template_tid', 0);
     $settings = _forum_access_get_settings($tid);
-  }
-  else {  // create
+  } else {  // create
     $template_tid = variable_get('forum_access_new_template_tid', NULL);
     $settings = _forum_access_get_settings($template_tid);
   }
@@ -288,8 +287,7 @@ 
           $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
           );
-        }
-        else {
+        } else {
           $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
           );
@@ -297,8 +295,7 @@ 
         $form['forum_access']['interference']['by_content_access'][] = array(
           '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
         );
-      }
-      else {
+      } else {
         $form['forum_access']['interference'][] = array(
           '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
         );
@@ -445,21 +442,17 @@ 
       $element[$rid]['#suffix'] = "</span>";
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#disabled'] = TRUE;
-    }
-    elseif ($element['#parents'][1] == 'create') {
+    } elseif ($element['#parents'][1] == 'create') {
       // Do nothing (Post is always mutable).
-    }
-    elseif ($element['#parents'][1] == 'comment_create') {
-    }
-    elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
+    } elseif ($element['#parents'][1] == 'comment_create') {
+    } elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
       $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
       $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
       if (isset($permissions[$rid]['administer nodes'])) {
         $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
       }
       $element[$rid]['#suffix'] = "</span>";
-    }
-    elseif (isset($permissions[$rid]['administer nodes'])) {
+    } elseif (isset($permissions[$rid]['administer nodes'])) {
       $element[$rid]['#disabled'] = TRUE;
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
@@ -515,8 +508,7 @@ 
     if ($settings['priority'] != 0) {
       $form['interference']['advanced']['#collapsed'] = FALSE;
     }
-  }
-  elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
+  } elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
       $imv = reset($form_state['values']['forum_access']['template']['taxonomy']);
     $template_tid = reset($imv);
   }
@@ -549,14 +541,12 @@ 
   $template_tid = reset(array_values($access['template']['taxonomy']));
   if ($access['template']['select_by_default']) {
     variable_set('forum_access_default_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
+  } elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
     variable_del('forum_access_default_template_tid');
   }
   if ($access['template']['load_for_new']) {
     variable_set('forum_access_new_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
+  } elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
     variable_del('forum_access_new_template_tid');
   }
   module_load_include('node.inc', 'forum_access');
@@ -598,8 +588,7 @@ 
       // We prefer not to save records for node administrators, because these have access anyway.
       if (isset($permissions[$rid]['administer forums']) && $access['view'][$rid]) {
         // For forum administrators, View needs to be saved, ...
-      }
-      else {
+      } else {
         // ... otherwise forget View.
         $access['view'][$rid] = FALSE;
       }
@@ -607,8 +596,7 @@ 
         db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
         $tid, $rid, !empty($access['view'][$rid]), 0, 0, !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
       }
-    }
-    else {
+    } else {
       db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
       $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
@@ -620,8 +608,7 @@ 
   if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
     if (!isset($access['update_choice']) || $access['update_choice'] == 2) {
       node_access_needs_rebuild(TRUE);
-    }
-    elseif ($access['update_choice'] == 0) {
+    } elseif ($access['update_choice'] == 0) {
       // update immediately (but use the batch functions anyway
       $save_redirect = $form_state['redirect'];
       $form_state['redirect'] = $_GET['q'];
@@ -637,8 +624,7 @@ 
       }
       _forum_access_update_batch_finished(TRUE, array(), array());
       $form_state['redirect'] = $save_redirect;
-    }
-    else {
+    } else {
       // mass update in batch mode, modeled after node.module
       $limit = $access['update_limit'];
       $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
@@ -698,8 +684,7 @@ 
   if ($success) {
     drupal_set_message(t('The content access permissions have been updated.'));
     cache_clear_all();
-  }
-  else {
+  } else {
     drupal_set_message(t('The content access permissions have not been properly updated.'), 'error');
   }
 }
@@ -744,8 +729,7 @@ 
     $return['view'] = array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID);
     $return['create'] = array(DRUPAL_AUTHENTICATED_RID);
     $return['comment_create'] = array(DRUPAL_AUTHENTICATED_RID);
-  }
-  else {
+  } else {
     $result = db_query("SELECT * FROM {forum_access} where tid = %d", $tid);
     while ($access = db_fetch_object($result)) {
       if ($access->grant_view) {
@@ -831,8 +815,7 @@ 
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
       .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
       .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
-  }
-  else {
+  } else {
     $vid = _forum_access_get_vid();
     $vocabulary = taxonomy_vocabulary_load($vid);
     if (isset($vocabulary->nodes[arg(3)])) {
@@ -926,8 +909,7 @@ 
       }
       watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
       return $rid;
-    }
-    else {
+    } else {
       $msg = t('!Forum_Access cannot create the %role role!', $variables);
       watchdog('user', $msg, NULL, WATCHDOG_WARNING);
       drupal_set_message($msg .' '. t('Is it already in use?'), 'error');

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

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
  * Return the Views fields that should be translated.
  *
  * @return
- *   Array of field names.
+ string[]   Array of field names.
  */
 function _i18nviews_display_fields() {
   return array('title', 'header', 'footer', 'empty');

Indentation +70 added lines, -70 removed lines

@@ -14,44 +14,44 @@ 
  * Implementation of hook_help().
  */
 function i18nviews_help($path, $arg) {
-  switch ($path) {
+    switch ($path) {
     case 'admin/modules#description' :
       $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
-      return $output;
-  }
+        $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+        return $output;
+    }
 }
 
 /**
  * Implementation of hook_locale().
  */
 function i18nviews_locale($op = 'groups') {
-  switch ($op) {
+    switch ($op) {
     case 'groups':
       return array('views' => t('Views'));
     case 'info':
       $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
-      $info['views']['format'] = TRUE;
-      return $info;
-  }
+        $info['views']['format'] = TRUE;
+        return $info;
+    }
 }
 
 /**
  * Refresh views locales, 2.x version
  */
 function i18nviews_locale_refresh() {
-  $views = views_get_all_views();
-  foreach ($views as $view) {
+    $views = views_get_all_views();
+    foreach ($views as $view) {
     if (!$view->disabled) {
-      $fields = _i18nviews_display_fields();
-      if (!empty($view->display) && is_array($view->display)) {
+        $fields = _i18nviews_display_fields();
+        if (!empty($view->display) && is_array($view->display)) {
         foreach (array_keys($view->display) as $display_id) {
-          _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->display_options, $fields, TRUE);
+            _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->display_options, $fields, TRUE);
+        }
         }
-      }
     }
-  }
-  return TRUE; // Completed successfully
+    }
+    return TRUE; // Completed successfully
 }
 
 /**
@@ -60,37 +60,37 @@ 
  * Remake of views_handler_field_allterms with term name translation.
  */
 function i18nviews_views_handler_field_allterms($fieldinfo, $fielddata, $value, $data) {
-  if ($fieldinfo['vocabulary']) {
+    if ($fieldinfo['vocabulary']) {
     $terms = taxonomy_node_get_terms_by_vocabulary($data->nid, $fieldinfo['vocabulary']);
-  }
-  else {
+    }
+    else {
     $terms = taxonomy_node_get_terms($data->nid);
-  }
-  // Translate all these terms.
-  _i18ntaxonomy_translate_terms($terms);
+    }
+    // Translate all these terms.
+    _i18ntaxonomy_translate_terms($terms);
 
-  if ($fielddata['options'] == 'nolink') {
+    if ($fielddata['options'] == 'nolink') {
     foreach ($terms as $term) {
-      $links[] = check_plain($term->name);
+        $links[] = check_plain($term->name);
     }
     $links = !empty($links) ? implode(' | ', $links) : '';
-  }
-  else {
+    }
+    else {
     $node = new stdClass();
     $node->taxonomy = $terms;
     $links = theme('links', taxonomy_link('taxonomy terms', $node));
-  }
-  return $links;
+    }
+    return $links;
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function i18nviews_views_api() {
-  return array(
+    return array(
     'api' => '2.0',
     'path' => drupal_get_path('module', 'i18nviews') . '/includes',
-  );
+    );
 }
 
 /**
@@ -105,38 +105,38 @@ 
  * This is just for views 2.x, next version (3.x) will use a different one
  */
 function i18nviews_views_pre_view(&$view, &$display_id, &$args) {
-  global $language;
-  if (views_api_version() == '2.0' && $language->language != language_default('language')) {
+    global $language;
+    if (views_api_version() == '2.0' && $language->language != language_default('language')) {
     // Also checking weird values for $display_id, see 277711
     if (!empty($view->display) && is_array($view->display) && is_string($display_id)) {
-      $fields = _i18nviews_display_fields();
-      if(!empty($view->display[$display_id])) {
+        $fields = _i18nviews_display_fields();
+        if(!empty($view->display[$display_id])) {
         $fields = _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->handler->options, $fields);
-      }
-      if($fields && !empty($view->display['default'])) {
+        }
+        if($fields && !empty($view->display['default'])) {
         _i18nviews_localize_array($view->name, 'default', $view->display['default']->handler->options, $fields);
-      }      
+        }      
     }
     // Translate taxonomy fields.
     // @todo I don think this works at all.
     if (module_exists('i18ntaxonomy') && isset($view->field) && is_array($view->field)) {
-      $translate = variable_get('i18ntaxonomy_vocabularies', array());
-      foreach ($view->field as $index => $data) {
+        $translate = variable_get('i18ntaxonomy_vocabularies', array());
+        foreach ($view->field as $index => $data) {
         $matches = array();
         if ($data['id'] == 'term_node.name') {
-          // That's a full taxonomy box.
-          $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
+            // That's a full taxonomy box.
+            $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
         }
         elseif (preg_match("/term_node_(\d+)\.name/", $data['id'], $matches)) {
-          $vid = $matches[1];
-          if ($translate[$vid]) {
+            $vid = $matches[1];
+            if ($translate[$vid]) {
             // Set new handler for this field.
             $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
-          }
+            }
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
@@ -146,7 +146,7 @@ 
  *   Array of field names.
  */
 function _i18nviews_display_fields() {
-  return array('title', 'header', 'footer', 'empty');
+    return array('title', 'header', 'footer', 'empty');
 }
 
 /**
@@ -155,21 +155,21 @@ 
  * We get the translated fields out of the array so they are not translated again.
  */
 function _i18nviews_localize_array($name, $group, &$data, $field_names, $update = FALSE) {
-  $translated = array();
-  foreach ($field_names as $field) {
+    $translated = array();
+    foreach ($field_names as $field) {
     if (!empty($data[$field])) {
-      if ($update) {
+        if ($update) {
         $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
-      }
-      else {
+        }
+        else {
         $data[$field] = i18nstrings("views:$name:$group:$field", $data[$field]);
         $translated[] = $field;
-      }
+        }
     }
-  }
-  // Return remaining field names
-  return array_diff($field_names, $translated);
+    }
+    // Return remaining field names
+    return array_diff($field_names, $translated);
 }
 
 /**
@@ -178,15 +178,15 @@ 
  * We cannot play with object 2 array conversion because some are real typed objects.
  */
 function _i18nviews_localize_object($name, $group, &$data, &$field_names, $trim = FALSE) {
-  $translated = array();
-  foreach ($field_names as $field) {
+    $translated = array();
+    foreach ($field_names as $field) {
     if (!empty($data->$field)) {
-      $data->$field = i18nstrings("views:$name:$group:$field", $data->$field);
+        $data->$field = i18nstrings("views:$name:$group:$field", $data->$field);
+    }
     }
-  }
-  if ($trim && $translated) {
+    if ($trim && $translated) {
     $field_names = array_diff($field_names, $translated);
-  }
+    }
 }
 
 /**
@@ -195,7 +195,7 @@ 
  * Add a submit handler to the submit button on views_ui_edit_display_form.
  */
 function i18nviews_form_views_ui_edit_display_form_alter(&$form, $form_state) {
-  $form['buttons']['submit']['#submit'][] = 'i18nviews_views_ui_edit_display_submit';
+    $form['buttons']['submit']['#submit'][] = 'i18nviews_views_ui_edit_display_submit';
 }
 
 /**
@@ -204,13 +204,13 @@ 
  * Creates or updates translation source records for specified Views fields.
  */
 function i18nviews_views_ui_edit_display_submit($form, &$form_state) {
-  $fields = _i18nviews_display_fields();
-  foreach ($fields as $field) {
+    $fields = _i18nviews_display_fields();
+    foreach ($fields as $field) {
     if (isset($form_state['values'][$field])) {
-      $name = $form_state['view']->name;
-      $group = $form_state['display_id'];
-      $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
-      i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
+        $name = $form_state['view']->name;
+        $group = $form_state['display_id'];
+        $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
+        i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
+    }
     }
-  }
 }

Switch Indentation +10 added lines, -10 removed lines

@@ -15,10 +15,10 @@ 
  */
 function i18nviews_help($path, $arg) {
   switch ($path) {
-    case 'admin/modules#description' :
-      $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
-      return $output;
+  case 'admin/modules#description' :
+    $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
+    $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+    return $output;
   }
 }
 
@@ -27,12 +27,12 @@ 
  */
 function i18nviews_locale($op = 'groups') {
   switch ($op) {
-    case 'groups':
-      return array('views' => t('Views'));
-    case 'info':
-      $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
-      $info['views']['format'] = TRUE;
-      return $info;
+  case 'groups':
+    return array('views' => t('Views'));
+  case 'info':
+    $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
+    $info['views']['format'] = TRUE;
+    return $info;
   }
 }
 

Spacing +7 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
 function i18nviews_help($path, $arg) {
   switch ($path) {
     case 'admin/modules#description' :
-      $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+      $output = '<p>'.t('Supports translation for views strings: title, header, footer...').'</p>';
+      $output .= '<p>'.t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))).'</p>';
       return $output;
   }
 }
@@ -89,7 +89,7 @@ 
 function i18nviews_views_api() {
   return array(
     'api' => '2.0',
-    'path' => drupal_get_path('module', 'i18nviews') . '/includes',
+    'path' => drupal_get_path('module', 'i18nviews').'/includes',
   );
 }
 
@@ -110,10 +110,10 @@ 
     // Also checking weird values for $display_id, see 277711
     if (!empty($view->display) && is_array($view->display) && is_string($display_id)) {
       $fields = _i18nviews_display_fields();
-      if(!empty($view->display[$display_id])) {
+      if (!empty($view->display[$display_id])) {
         $fields = _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->handler->options, $fields);
       }
-      if($fields && !empty($view->display['default'])) {
+      if ($fields && !empty($view->display['default'])) {
         _i18nviews_localize_array($view->name, 'default', $view->display['default']->handler->options, $fields);
       }      
     }
@@ -159,7 +159,7 @@ 
   foreach ($field_names as $field) {
     if (!empty($data[$field])) {
       if ($update) {
-        $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
+        $format = isset($data[$field.'_format']) ? $data[$field.'_format'] : NULL;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
       }
       else {
@@ -209,7 +209,7 @@ 
     if (isset($form_state['values'][$field])) {
       $name = $form_state['view']->name;
       $group = $form_state['display_id'];
-      $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
+      $format = isset($form_state['values'][$field.'_format']) ? $form_state['values'][$field.'_format'] : NULL;
       i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
     }
   }

Braces +4 added lines, -8 removed lines

@@ -62,8 +62,7 @@ 
 function i18nviews_views_handler_field_allterms($fieldinfo, $fielddata, $value, $data) {
   if ($fieldinfo['vocabulary']) {
     $terms = taxonomy_node_get_terms_by_vocabulary($data->nid, $fieldinfo['vocabulary']);
-  }
-  else {
+  } else {
     $terms = taxonomy_node_get_terms($data->nid);
   }
   // Translate all these terms.
@@ -74,8 +73,7 @@ 
       $links[] = check_plain($term->name);
     }
     $links = !empty($links) ? implode(' | ', $links) : '';
-  }
-  else {
+  } else {
     $node = new stdClass();
     $node->taxonomy = $terms;
     $links = theme('links', taxonomy_link('taxonomy terms', $node));
@@ -126,8 +124,7 @@ 
         if ($data['id'] == 'term_node.name') {
           // That's a full taxonomy box.
           $view->field[$index]['handler'] = 'i18ntaxonomy_views_handler_field_allterms';
-        }
-        elseif (preg_match("/term_node_(\d+)\.name/", $data['id'], $matches)) {
+        } elseif (preg_match("/term_node_(\d+)\.name/", $data['id'], $matches)) {
           $vid = $matches[1];
           if ($translate[$vid]) {
             // Set new handler for this field.
@@ -161,8 +158,7 @@ 
       if ($update) {
         $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
-      }
-      else {
+      } else {
         $data[$field] = i18nstrings("views:$name:$group:$field", $data[$field]);
         $translated[] = $field;
       }