BOINC / boinc

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

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
       $view->display[$display]->display_options['fields'][$views_field['field']]['format'] = $views_field['options'];
       if ($views_field['handler'] == 'content_views_field_handler_group') {
         $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 1;
-      }
-      else {
+      } else {
         $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 0;
       }
       return;

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

Braces +1 added lines, -2 removed lines

@@ -252,8 +252,7 @@
       if ($db_fields_count == 1) {
         $title = t('@label (!name)', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $title_short = check_plain($label_truncated);
-      }
-      else {
+      } else {
         $title = t('@label (!name) - !column', array('@label' => t($field['widget']['label']), '!name' => $field['field_name'], '!column' => $columns[$i]));
         $title_short = t('@label-truncated - !column', array('@label-truncated' => $label_truncated, '!column' => $columns[$i]));
       }

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_filter_many_to_one.inc

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
       // For selects, HTML should be filtered out and entities left unencoded.
       // See content_allowed_values / content_filter_xss / filter_xss.
       content_allowed_values_filter_html($options);
-    }
-    else {
+    } else {
       $options = function_exists($function) ? $function($field) : content_allowed_values($field);
     }
     return (array) $options;

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_argument_many_to_one.inc

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
     $value = $data->{$this->name_alias};
     if (isset($options[$value])) {
       $value = $options[$value];
-    }
-    else {
+    } else {
       $value = parent::summary_name($data);
     }
 

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_field_multiple.inc

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
       );
       if ($view->base_table == 'node_revisions') {
         $this->additional_fields['vid'] = array('table' => 'node_revisions', 'field' => 'vid');
-      }
-      else {
+      } else {
         $this->additional_fields['vid'] = array('table' => 'node', 'field' => 'vid');
       }
     }
@@ -245,8 +244,7 @@ 
             $nid = $item['_nid'];
             unset($item['_nid']);
             $items[] = $item;
-          }
-          else {
+          } else {
             break;
           }
         }
@@ -276,8 +274,7 @@ 
               $rendered[] = $this->render_link($output, (object) array('nid' => $nid));
             }
           }
-        }
-        else {
+        } else {
           // Multiple values formatter.
           $output = content_format($field, $items, $formatter_name, $values);
           if (!empty($output)) {
@@ -288,8 +285,7 @@ 
         if (count($rendered) > 1) {
           // TODO: could we use generic field display ?
           return theme('content_view_multiple_field', $rendered, $field, $values);
-        }
-        elseif ($rendered) {
+        } elseif ($rendered) {
           return $rendered[0];
         }
       }
@@ -308,13 +304,11 @@ 
         // Views 2.3+
         $this->options['alter']['make_link'] = TRUE;
         $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
-      }
-      else {
+      } else {
         // Views up to 2.2
         return l($data, "node/" . $values->nid, array('html' => TRUE));
       }
-    }
-    else {
+    } else {
       return $data;
     }
   }

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_plugin_display_simple.inc

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
       $clause = isset($match_clauses[$options['match']]) ? $match_clauses[$options['match']] : $match_clauses['contains'];
       $alias = $this->view->query->ensure_table($options['table']);
       $this->view->query->add_where(NULL, "$alias.$options[field_string] $clause", $options['string']);
-    }
-    elseif ($options['ids']) {
+    } elseif ($options['ids']) {
       $alias = $this->view->query->ensure_table($options['table']);
       $this->view->query->add_where(NULL, "$alias.$options[field_id] IN (" . db_placeholders($options['ids']) . ')', $options['ids']);
     }

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_field.inc

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
     // about won't end up wrapping a span around a block-level element.
     if ($this->content_field['widget']['type'] == 'text_textarea') {
       return 'div';
-    }
-    else {
+    } else {
       return 'span';
     }
   }
@@ -216,8 +215,7 @@ 
       if (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE) {
         // Single-value formatter.
         $output = content_format($field, $item, $formatter_name, $node);
-      }
-      else {
+      } else {
         // Multiple values formatter - we actually have only one value to display.
         $output = content_format($field, array($item), $formatter_name, $node);
       }

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

Braces +25 added lines, -50 removed lines

@@ -34,8 +34,7 @@ 
       // Set the delete column.
       if ($type->custom) {
         $row[] = array('data' => l(t('delete'), 'admin/content/node-type/'. $type_url_str .'/delete'));
-      }
-      else {
+      } else {
         $row[] = array('data' => '');
       }
 
@@ -94,8 +93,7 @@ 
   }
   if (empty($rows)) {
     $output = t('No fields have been defined for any content type yet.');
-  }
-  else {
+  } else {
     $output = theme('table', $header, $rows);
   }
   return $output;
@@ -496,16 +494,14 @@ 
     if (in_array($key, $form['#fields'])) {
       db_query("UPDATE {". content_instance_tablename() ."} SET weight = %d WHERE type_name = '%s' AND field_name = '%s'",
         $values['weight'], $type_name, $key);
-    }
-    elseif (in_array($key, $form['#extra'])) {
+    } elseif (in_array($key, $form['#extra'])) {
       $extra[$key] = $values['weight'];
     }
   }
 
   if ($extra) {
     variable_set('content_extra_weights_'. $type_name, $extra);
-  }
-  else {
+  } else {
     variable_del('content_extra_weights_'. $type_name);
   }
 
@@ -523,8 +519,7 @@ 
       // Store new field information for fieldgroup submit handler.
       $form_state['fields_added']['_add_new_field'] = $field['field_name'];
       $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
-    }
-    else {
+    } else {
       drupal_set_message(t('There was a problem creating field %label.', array(
         '%label' => $field['label'])));
     }
@@ -538,15 +533,13 @@ 
 
     if ($existing_field['locked']) {
       drupal_set_message(t('The field %label cannot be added to a content type because it is locked.', array('%label' => $field['field_name'])));
-    }
-    else {
+    } else {
       module_load_include('inc', 'content', 'includes/content.crud');
       if (content_field_instance_create($field)) {
         // Store new field information for fieldgroup submit handler.
         $form_state['fields_added']['_add_existing_field'] = $field['field_name'];
         $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
-      }
-      else {
+      } else {
         drupal_set_message(t('There was a problem adding field %label.', array('%label' => $field['field_name'])));
       }
     }
@@ -756,16 +749,14 @@ 
 
   if ($field_type) {
     return !empty($options[$field_type]) ? $options[$field_type] : array();
-  }
-  elseif ($by_label) {
+  } elseif ($by_label) {
     $field_types = _content_field_types();
     $options_by_label = array();
     foreach ($options as $field_type => $widgets) {
       $options_by_label[t($field_types[$field_type]['label'])] = $widgets;
     }
     return $options_by_label;
-  }
-  else {
+  } else {
     return $options;
   }
 }
@@ -878,8 +869,7 @@ 
   if (content_field_instance_update($field)) {
     drupal_set_message(t('Updated basic settings for field %label.', array(
       '%label' => $label)));
-  }
-  else {
+  } else {
     drupal_set_message(t('There was a problem updating the basic settings for field %label.', array(
       '%label' => $label)));
   }
@@ -940,8 +930,7 @@ 
       drupal_set_message(t('Removed field %field from %type.', array(
         '%field' => $field['widget']['label'],
         '%type' => $type['name'])));
-    }
-    else {
+    } else {
       drupal_set_message(t('There was a problem deleting %field from %type.', array(
         '%field' => $field['widget']['label'],
         '%type' => $type['name'])));
@@ -1122,8 +1111,7 @@ 
           '@link_devel' => 'http://www.drupal.org/project/devel',
           '%type' => $type_name)),
       );
-    }
-    else {
+    } else {
       $form['widget']['default_value_fieldset']['advanced_options']['markup_default_value_php'] = array(
         '#type' => 'item',
         '#title' => t('Code'),
@@ -1248,8 +1236,7 @@ 
       ob_end_clean();
       if (!is_array($return)) {
         $error = TRUE;
-      }
-      else {
+      } else {
         foreach ($return as $item) {
           if (!is_array($item)) {
             $error = TRUE;
@@ -1269,15 +1256,13 @@ 
           '!sample' => $sample,
           '@value' => print_r($return, TRUE))));
         return;
-      }
-      else {
+      } else {
         $default_value = $return;
         $is_code = TRUE;
         form_set_value(array('#parents' => array('default_value_php')), $php, $form_state);
         form_set_value(array('#parents' => array('default_value')), array(), $form_state);
       }
-    }
-    elseif (!empty($form_values['default_value_widget'])) {
+    } elseif (!empty($form_values['default_value_widget'])) {
       // Fields that handle their own multiple values may use an expected
       // value as the top-level key, so just pop off the top element.
       $key = array_shift(array_keys($form_values['default_value_widget']));
@@ -1306,8 +1291,7 @@ 
         if (trim($form_values['default_value_php'])) {
           form_set_error('default_value_php', t("The PHP code for 'default value' returned @value, which is invalid.", array(
             '@value' => print_r($default_value, TRUE))));
-        }
-        else {
+        } else {
           form_set_error('default_value', t('The default value is invalid.'));
         }
       }
@@ -1337,8 +1321,7 @@ 
   if ($destinations) {
     drupal_set_message(t('Added field %label.', array('%label' => $form_values['label'])));
     $form_state['redirect'] = content_get_destinations($destinations);
-  }
-  else {
+  } else {
     drupal_set_message(t('Saved field %label.', array('%label' => $form_values['label'])));
     $type = content_types($form_values['type_name']);
     $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields';
@@ -1455,8 +1438,7 @@ 
   if (empty($new_field)) {
     if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
       db_drop_table($ret, $previous_table);
-    }
-    else {
+    } else {
       foreach ($previous_schema['fields'] as $column => $attributes) {
         if (!in_array($column, array('nid', 'vid', 'delta'))) {
           db_drop_field($ret, $previous_table, $column);
@@ -1478,8 +1460,7 @@ 
   // Create new table and columns, if not already created.
   if (!db_table_exists($new_table)) {
     db_create_table($ret, $new_table, $new_schema);
-  }
-  else {
+  } else {
     // Or add fields and/or indexes to an existing table.
     foreach ($new_schema['fields'] as $column => $attributes) {
       if (!in_array($column, array('nid', 'vid', 'delta'))) {
@@ -1530,8 +1511,7 @@ 
         db_drop_field($ret, $new_table, 'delta');
         db_drop_primary_key($ret, $new_table);
         db_add_primary_key($ret, $new_table, array('vid'));
-      }
-      else if ($previous_field['multiple'] == 0 && $new_field['multiple'] > 0) {
+      } else if ($previous_field['multiple'] == 0 && $new_field['multiple'] > 0) {
         db_add_field($ret, $new_table, 'delta', array(
           'type' => 'int',
           'unsigned' => TRUE,
@@ -1550,8 +1530,7 @@ 
     if ($new_field['multiple']) {
       db_query('INSERT INTO {'. $new_table .'} (vid, nid, delta, '. implode(', ', $columns) .') '.
         ' SELECT vid, nid, 0, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
-    }
-    else {
+    } else {
       db_query('INSERT INTO {'. $new_table .'} (vid, nid, '. implode(', ', $columns) .') '.
         ' SELECT vid, nid, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
     }
@@ -1568,8 +1547,7 @@ 
     content_alter_db_cleanup();
     if ($previous_field['multiple']) {
       $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE delta = 0 AND n.type = '%s'", $new_field['type_name']);
-    }
-    else {
+    } else {
       $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE n.type = '%s'", $new_field['type_name']);
     }
     $record = array();
@@ -1582,8 +1560,7 @@ 
       foreach ($migrate_columns as $column => $attributes) {
         if (is_null($data[$column])) {
           $record[$column] = NULL;
-        }
-        else {
+        } else {
           $record[$column] = $data[$column];
           // Prevent double serializtion in drupal_write_record.
           if (isset($attributes['serialize']) && $attributes['serialize']) {
@@ -1595,8 +1572,7 @@ 
       '} WHERE vid = %d AND nid = %d', $data['vid'], $data['nid']))) {
         $keys = $new_field['multiple'] ? array('vid', 'delta') : array('vid');
         drupal_write_record($new_table, $record, $keys);
-      }
-      else {
+      } else {
         drupal_write_record($new_table, $record);
       }
     }
@@ -1720,8 +1696,7 @@ 
 function _content_alter_fields_finished($success, $results, $operations) {
   if ($success) {
     drupal_set_message(t('The database has been altered and data has been migrated or deleted.'));
-  }
-  else {
+  } else {
     drupal_set_message(t('An error occurred and database alteration did not complete.'), 'error');
     $message = format_plural(count($results), '1 item successfully processed:', '@count items successfully processed:');
     $message .= theme('item_list', $results);

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

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