BOINC / boinc

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

Indentation +107 added lines, -107 removed lines

@@ -10,7 +10,7 @@ 
  * Implementation of hook_form_alter().
  */
 function content_profile_registration_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'user_register') {
+    if ($form_id == 'user_register') {
     require_once drupal_get_path('module', 'node') .'/node.pages.inc';
 
     // Allow other modules to customize the used profile types, so modules
@@ -19,44 +19,44 @@ 
     $form += array('#content_profile_registration_use_types' => $default_types);
 
     foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
-      content_profile_registration_add_profile_form($type, $form, $form_state);
+        content_profile_registration_add_profile_form($type, $form, $form_state);
     }
-  }
-  elseif ($form_id == 'content_profile_admin_settings') {
+    }
+    elseif ($form_id == 'content_profile_admin_settings') {
     $type = $form_state['type'];
     // Let other modules add registration child elements before us!
     $form += array('registration' => array());
     $form['registration'] += array(
-      '#type' => 'fieldset',
-      '#title' => t('User Registration'),
-      '#description' => t('Customize how this content profile shows up on the user registration page.'),
-      '#collapsible' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('User Registration'),
+        '#description' => t('Customize how this content profile shows up on the user registration page.'),
+        '#collapsible' => TRUE,
     );
     $form['registration']['registration_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use on Registration'),
-      '#description' => t('Use this content type on the user registration page'),
-      '#default_value' => content_profile_get_settings($type, 'registration_use'),
+        '#type' => 'checkbox',
+        '#title' => t('Use on Registration'),
+        '#description' => t('Use this content type on the user registration page'),
+        '#default_value' => content_profile_get_settings($type, 'registration_use'),
     );
     $form['registration']['admin_user_create_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use on administrative user creation form'),
-      '#description' => t('Use this content type when an administrative user creates a new user'),
-      '#default_value' => content_profile_get_settings($type, 'admin_user_create_use'),
+        '#type' => 'checkbox',
+        '#title' => t('Use on administrative user creation form'),
+        '#description' => t('Use this content type when an administrative user creates a new user'),
+        '#default_value' => content_profile_get_settings($type, 'admin_user_create_use'),
     );
     $form['registration']['registration_hide'] = array(
-      '#type' => 'checkboxes',
-      '#title' => t('Hide form fields'),
-      '#description' => t('Hide fields from the user registration form. Required fields cannot be hidden and are not shown here.'),
-      '#options' => _content_profile_registration_get_field_select($type),
-      '#default_value' => content_profile_get_settings($type, 'registration_hide'),
+        '#type' => 'checkboxes',
+        '#title' => t('Hide form fields'),
+        '#description' => t('Hide fields from the user registration form. Required fields cannot be hidden and are not shown here.'),
+        '#options' => _content_profile_registration_get_field_select($type),
+        '#default_value' => content_profile_get_settings($type, 'registration_hide'),
     );
     array_unshift($form['#submit'], 'content_profile_registration_admin_form_submit');
-  }
+    }
 }
 
 function content_profile_registration_admin_form_submit($form, &$form_state) {
-  $form_state['values']['registration_hide'] = array_keys(array_filter($form_state['values']['registration_hide']));
+    $form_state['values']['registration_hide'] = array_keys(array_filter($form_state['values']['registration_hide']));
 }
 
 /**
@@ -68,8 +68,8 @@ 
  *   Associated fields for the given content type.
  */
 function _content_profile_registration_get_fields($type) {
-  $typeinfo = content_types($type);
-  return $typeinfo['fields'];
+    $typeinfo = content_types($type);
+    return $typeinfo['fields'];
 }
 
 /**
@@ -81,19 +81,19 @@ 
  *   An array of fields suitable for use in a select field.
 */
 function _content_profile_registration_get_field_select($type) {
-  $fields = module_exists('content') ? _content_profile_registration_get_fields($type) : array();
-  $return = array();
-  if (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_ENABLED) {
+    $fields = module_exists('content') ? _content_profile_registration_get_fields($type) : array();
+    $return = array();
+    if (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_ENABLED) {
     $return['title'] = t('Title');
-  }
-  foreach ($fields as $fieldname => $info) {
+    }
+    foreach ($fields as $fieldname => $info) {
     if (!$info['required']) {
-      $return[$fieldname] = drupal_ucfirst($info['widget']['label']);
+        $return[$fieldname] = drupal_ucfirst($info['widget']['label']);
     }
-  }
-  $return['other'] = t('Other form elements (except for required CCK fields)');
+    }
+    $return['other'] = t('Other form elements (except for required CCK fields)');
   
-  return $return;
+    return $return;
 }
 
 /**
@@ -104,28 +104,28 @@ 
  * @see content_profile_registration_user_register_submit()
  */
 function content_profile_registration_add_profile_form($type, &$form, &$form_state) {
-  // Initialize new node and add in its form.
-  $node = array('uid' => 0, 'name' => '', 'type' => $type);
-  // Get the original node form.
-  $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
-  drupal_prepare_form($type .'_node_form', $node_form, $form_state);
+    // Initialize new node and add in its form.
+    $node = array('uid' => 0, 'name' => '', 'type' => $type);
+    // Get the original node form.
+    $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
+    drupal_prepare_form($type .'_node_form', $node_form, $form_state);
 
-  $node_form += array('#field_info' => array());
-  $form_add = array();
+    $node_form += array('#field_info' => array());
+    $form_add = array();
 
-  // If non-CCK form elements are hidden, only copy over the CCK stuff
-  if (in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
+    // If non-CCK form elements are hidden, only copy over the CCK stuff
+    if (in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
     foreach ($node_form['#field_info'] as $field_name => $info) {
-      if (isset($node_form[$field_name])) {
+        if (isset($node_form[$field_name])) {
         $form_add[$field_name] = $node_form[$field_name];
-      }
+        }
     }
     // Copy over any fieldgroups
     $keys = array_keys($node_form);
     foreach ($keys as $key) {
-      if (stristr($key, 'group_')) {
+        if (stristr($key, 'group_')) {
         $form_add[$key] = $node_form[$key];
-      }
+        }
     }
     // Add the title
     $form_add['title'] = $node_form['title'];
@@ -133,51 +133,51 @@ 
     // Set this to the values of one node, as it might be need by some #ahah callbacks
     $form_add['#node'] = $node_form['#node'];
     $form_add['type'] = $node_form['type'];
-  }
-  else {
+    }
+    else {
     foreach (array('uid', 'name', 'author', 'buttons', 'language', '#theme', 'options') as $key) {
-      unset($node_form[$key]);
+        unset($node_form[$key]);
     }
     $form_add = $node_form;
-  }
+    }
 
-  // Hide fields as configured
-  foreach (content_profile_get_settings($type, 'registration_hide') as $field_name) {
+    // Hide fields as configured
+    foreach (content_profile_get_settings($type, 'registration_hide') as $field_name) {
     if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type, $field_name))) {
-      unset($form_add[$group_name][$field_name]);
-      if (count(element_children($form_add[$group_name])) == 0) {
+        unset($form_add[$group_name][$field_name]);
+        if (count(element_children($form_add[$group_name])) == 0) {
         unset($form_add[$group_name]);
-      }
+        }
     }
     else {
-      unset($form_add[$field_name]);
+        unset($form_add[$field_name]);
+    }
     }
-  }
   
-  // Add in the new form elements into $form.
-  $form += array('#field_info' => array());
-  $form['#field_info'] += $node_form['#field_info'];
-  $form += $form_add;
+    // Add in the new form elements into $form.
+    $form += array('#field_info' => array());
+    $form['#field_info'] += $node_form['#field_info'];
+    $form += $form_add;
   
-  // Add in further callbacks needed, if not yet done.
-  if (!isset($form['#content_profile_weights'])) {
+    // Add in further callbacks needed, if not yet done.
+    if (!isset($form['#content_profile_weights'])) {
     $form['#submit'][] = 'content_profile_registration_user_register_submit';
     $form['#validate'][] = 'content_profile_registration_user_register_validate';
     $form['#pre_render'][] = 'content_profile_registration_alter_weights';
-  }
+    }
 
-  // Care for the weights: Make use of the content types weight and sort the fields in behalf
-  // The weights will be applied by the pre_render callback.
-  $form += array('#content_profile_weights' => array());
-  $weight = content_profile_get_settings($type, 'weight') + 1;
-  foreach (element_children($form_add) as $key) {
+    // Care for the weights: Make use of the content types weight and sort the fields in behalf
+    // The weights will be applied by the pre_render callback.
+    $form += array('#content_profile_weights' => array());
+    $weight = content_profile_get_settings($type, 'weight') + 1;
+    foreach (element_children($form_add) as $key) {
     $form['#content_profile_weights'] += array($key => $weight);
-  }
+    }
 
-  // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+    // Set the enctype, if necessary.
+    if (isset($node_form['#attributes']['enctype'])){
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
-  }
+    }
 }
 
 /**
@@ -187,13 +187,13 @@ 
  * @see content_profile_registration_add_profile_form().
  */
 function content_profile_registration_alter_weights($elements) {
-  foreach ($elements['#content_profile_weights'] as $key => $weight) {
+    foreach ($elements['#content_profile_weights'] as $key => $weight) {
     if (isset($elements[$key]) && is_array($elements[$key])) {
-      $elements[$key] += array('#weight' => 0);
-      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
+        $elements[$key] += array('#weight' => 0);
+        $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
     }
-  }
-  return $elements;
+    }
+    return $elements;
 }
 
 
@@ -201,9 +201,9 @@ 
  * Validates the user registration form
  */
 function content_profile_registration_user_register_validate($form, &$form_state) {
-  require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+    require_once drupal_get_path('module', 'node') .'/node.pages.inc';
 
-  foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
+    foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     $node = (object)$form_state['values'];
     $node->type = $type;
     node_object_prepare($node);
@@ -212,32 +212,32 @@ 
     unset($node->name);
 
     if (!in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
-      node_validate($node, $form);
+        node_validate($node, $form);
     }
     elseif (module_exists('content')) {
-      content_validate($node);
+        content_validate($node);
     }
 
     $form_state['content_profile_registration'][$type]['node'] = $node;
-  }
-  // Remove our added values
-  foreach ($form['#content_profile_weights'] as $key => $weight) {
+    }
+    // Remove our added values
+    foreach ($form['#content_profile_weights'] as $key => $weight) {
     _content_profile_registration_remove_values($key, $form[$key], $form_state);
-  }
+    }
 }
 
 /**
  * Recursivly removes all form values created by this element or its children.
  */
 function _content_profile_registration_remove_values($key, $element, &$form_state) {
-  if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
+    if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
     unset($form_state['values'][$key]);
-  }
-  elseif (empty($element['#input']) && empty($element['#tree'])) {
+    }
+    elseif (empty($element['#input']) && empty($element['#tree'])) {
     foreach (element_children($element) as $key) {
-      _content_profile_registration_remove_values($key, $element[$key], $form_state);
+        _content_profile_registration_remove_values($key, $element[$key], $form_state);
+    }
     }
-  }
 }
 
 
@@ -245,33 +245,33 @@ 
  * Submits the user registration form
  */
 function content_profile_registration_user_register_submit($form, &$form_state) {
-  foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
+    foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     if ($node = &$form_state['content_profile_registration'][$type]['node']) {
-      // Set user's information for the node.
-      if (empty($node->title) && (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_OPTIONAL)) {
+        // Set user's information for the node.
+        if (empty($node->title) && (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_OPTIONAL)) {
         $node->title = $form_state['user']->name;
-      }
-      $node->uid = $form_state['user']->uid;
-      $node->name = $form_state['user']->name;
+        }
+        $node->uid = $form_state['user']->uid;
+        $node->name = $form_state['user']->name;
 
-      // Create the node.
-      $node = node_submit($node);
-      node_save($node);
-      // Give us a nice log message.
-      if ($node->nid) {
+        // Create the node.
+        $node = node_submit($node);
+        node_save($node);
+        // Give us a nice log message.
+        if ($node->nid) {
         watchdog('content', 'Content Profile: added %user %type upon registration.', array('%user' => $node->name, '%type' => $type), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid"));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_content_profile_settings().
  */
 function content_profile_registration_content_profile_settings() {
-  return array(
+    return array(
     'registration_use' => FALSE,
     'admin_user_create_use' => FALSE,
     'registration_hide' => array(),
-  );
+    );
 }

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  */
 function content_profile_registration_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'user_register') {
-    require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+    require_once drupal_get_path('module', 'node').'/node.pages.inc';
 
     // Allow other modules to customize the used profile types, so modules
     // can easily customize the registration form.
@@ -107,8 +107,8 @@ 
   // Initialize new node and add in its form.
   $node = array('uid' => 0, 'name' => '', 'type' => $type);
   // Get the original node form.
-  $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
-  drupal_prepare_form($type .'_node_form', $node_form, $form_state);
+  $node_form = drupal_retrieve_form($type.'_node_form', $form_state, $node);
+  drupal_prepare_form($type.'_node_form', $node_form, $form_state);
 
   $node_form += array('#field_info' => array());
   $form_add = array();
@@ -175,7 +175,7 @@ 
   }
 
   // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+  if (isset($node_form['#attributes']['enctype'])) {
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
   }
 }
@@ -190,7 +190,7 @@ 
   foreach ($elements['#content_profile_weights'] as $key => $weight) {
     if (isset($elements[$key]) && is_array($elements[$key])) {
       $elements[$key] += array('#weight' => 0);
-      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
+      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight']/1000;
     }
   }
   return $elements;
@@ -201,7 +201,7 @@ 
  * Validates the user registration form
  */
 function content_profile_registration_user_register_validate($form, &$form_state) {
-  require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+  require_once drupal_get_path('module', 'node').'/node.pages.inc';
 
   foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     $node = (object)$form_state['values'];

Braces +6 added lines, -11 removed lines

@@ -21,8 +21,7 @@ 
     foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
       content_profile_registration_add_profile_form($type, $form, $form_state);
     }
-  }
-  elseif ($form_id == 'content_profile_admin_settings') {
+  } elseif ($form_id == 'content_profile_admin_settings') {
     $type = $form_state['type'];
     // Let other modules add registration child elements before us!
     $form += array('registration' => array());
@@ -133,8 +132,7 @@ 
     // Set this to the values of one node, as it might be need by some #ahah callbacks
     $form_add['#node'] = $node_form['#node'];
     $form_add['type'] = $node_form['type'];
-  }
-  else {
+  } else {
     foreach (array('uid', 'name', 'author', 'buttons', 'language', '#theme', 'options') as $key) {
       unset($node_form[$key]);
     }
@@ -148,8 +146,7 @@ 
       if (count(element_children($form_add[$group_name])) == 0) {
         unset($form_add[$group_name]);
       }
-    }
-    else {
+    } else {
       unset($form_add[$field_name]);
     }
   }
@@ -175,7 +172,7 @@ 
   }
 
   // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+  if (isset($node_form['#attributes']['enctype'])) {
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
   }
 }
@@ -213,8 +210,7 @@ 
 
     if (!in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
       node_validate($node, $form);
-    }
-    elseif (module_exists('content')) {
+    } elseif (module_exists('content')) {
       content_validate($node);
     }
 
@@ -232,8 +228,7 @@ 
 function _content_profile_registration_remove_values($key, $element, &$form_state) {
   if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
     unset($form_state['values'][$key]);
-  }
-  elseif (empty($element['#input']) && empty($element['#tree'])) {
+  } elseif (empty($element['#input']) && empty($element['#tree'])) {
     foreach (element_children($element) as $key) {
       _content_profile_registration_remove_values($key, $element[$key], $form_state);
     }

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

@@ -30,7 +30,7 @@ 
       '#type' => 'fieldset',
       '#title' => t('User Registration'),
       '#description' => t('Customize how this content profile shows up on the user registration page.'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
     );
     $form['registration']['registration_use'] = array(
       '#type' => 'checkbox',
@@ -270,8 +270,8 @@ 
  */
 function content_profile_registration_content_profile_settings() {
   return array(
-    'registration_use' => FALSE,
-    'admin_user_create_use' => FALSE,
+    'registration_use' => false,
+    'admin_user_create_use' => false,
     'registration_hide' => array(),
   );
 }

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

Indentation +43 added lines, -43 removed lines

@@ -12,83 +12,83 @@
  * Implementation of hook_token_values().
  */
 function content_profile_tokens_token_values($type, $object = NULL, $options = array()) {
-  $values = array();
-  $types = content_profile_get_types('types');
-  switch ($type) {
+    $values = array();
+    $types = content_profile_get_types('types');
+    switch ($type) {
     case 'user':
       foreach($types as $type_name => $type) {
         if (isset($object)) {
-          $profile = content_profile_load($type_name, $object->uid);
+            $profile = content_profile_load($type_name, $object->uid);
         }
         else {
-          global $user;
-          $profile = content_profile_load($type_name, $user->uid);
+            global $user;
+            $profile = content_profile_load($type_name, $user->uid);
         }
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
-          }
+            if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+                $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+                $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
+            }
+        }
         }
-      }
-      break;
+        break;
 
     case 'flag_friend':
       if(!empty($object)) {
         foreach($types as $type_name => $type) {
-          $profile_requestor = content_profile_load($type_name, $object->friend->uid);
-          $profile_requestee = content_profile_load($type_name, $object->uid);
+            $profile_requestor = content_profile_load($type_name, $object->friend->uid);
+            $profile_requestee = content_profile_load($type_name, $object->uid);
           
-          $fields = content_types($type_name);
-          foreach ($fields['fields'] as $field_name => $field) {
+            $fields = content_types($type_name);
+            foreach ($fields['fields'] as $field_name => $field) {
             if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+                $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+                $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
+                $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+                $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
             }
-          }
+            }
+        }
         }
-      }
-      break;
-  }
-  return $values;
+        break;
+    }
+    return $values;
 }
 
 /**
  * Implementation of hook_token_list().
  */
 function content_profile_tokens_token_list($type = 'all') {
-  $tokens = array();
-  if ($type == 'user' || $type == 'all') {
+    $tokens = array();
+    if ($type == 'user' || $type == 'all') {
     $types = content_profile_get_types('types');
     foreach ($types as $type_name => $type) {
     
-      $fields = content_types($type_name);
-      foreach ($fields['fields'] as $field_name => $field) {
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+        }
         }
-      }
     }
-  }
+    }
   
-  if ($type == 'flag_friend' && module_exists('flag_friend')) {
+    if ($type == 'flag_friend' && module_exists('flag_friend')) {
     foreach($types as $type_name => $type) {
-      $fields = content_types($type_name);
-      foreach ($fields['fields'] as $field_name => $field) {
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
 
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+        }
         }
-      }
     }
-  }
-  return $tokens;
+    }
+    return $tokens;
 }

Switch Indentation +30 added lines, -30 removed lines

@@ -15,44 +15,44 @@
   $values = array();
   $types = content_profile_get_types('types');
   switch ($type) {
-    case 'user':
-      foreach($types as $type_name => $type) {
-        if (isset($object)) {
-          $profile = content_profile_load($type_name, $object->uid);
-        }
-        else {
-          global $user;
-          $profile = content_profile_load($type_name, $user->uid);
-        }
-        $fields = content_types($type_name);
-        foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
-          }
+  case 'user':
+    foreach($types as $type_name => $type) {
+      if (isset($object)) {
+        $profile = content_profile_load($type_name, $object->uid);
+      }
+      else {
+        global $user;
+        $profile = content_profile_load($type_name, $user->uid);
+      }
+      $fields = content_types($type_name);
+      foreach ($fields['fields'] as $field_name => $field) {
+        if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+            $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+            $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
         }
       }
-      break;
+    }
+    break;
 
-    case 'flag_friend':
-      if(!empty($object)) {
-        foreach($types as $type_name => $type) {
-          $profile_requestor = content_profile_load($type_name, $object->friend->uid);
-          $profile_requestee = content_profile_load($type_name, $object->uid);
+  case 'flag_friend':
+    if(!empty($object)) {
+      foreach($types as $type_name => $type) {
+        $profile_requestor = content_profile_load($type_name, $object->friend->uid);
+        $profile_requestee = content_profile_load($type_name, $object->uid);
           
-          $fields = content_types($type_name);
-          foreach ($fields['fields'] as $field_name => $field) {
-            if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
+          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+            $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+            $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
-            }
+            $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+            $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
           }
         }
       }
-      break;
+    }
+    break;
   }
   return $values;
 }

Spacing +16 added lines, -16 removed lines

@@ -16,7 +16,7 @@ 
   $types = content_profile_get_types('types');
   switch ($type) {
     case 'user':
-      foreach($types as $type_name => $type) {
+      foreach ($types as $type_name => $type) {
         if (isset($object)) {
           $profile = content_profile_load($type_name, $object->uid);
         }
@@ -27,27 +27,27 @@ 
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
           if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
+              $values['content-profile-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+              $values['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile->{$field_name}[0]['value'];
           }
         }
       }
       break;
 
     case 'flag_friend':
-      if(!empty($object)) {
-        foreach($types as $type_name => $type) {
+      if (!empty($object)) {
+        foreach ($types as $type_name => $type) {
           $profile_requestor = content_profile_load($type_name, $object->friend->uid);
           $profile_requestee = content_profile_load($type_name, $object->uid);
           
           $fields = content_types($type_name);
           foreach ($fields['fields'] as $field_name => $field) {
             if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+              $values['requestor-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+              $values['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
+              $values['requestee-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+              $values['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestee->{$field_name}[0]['value'];
             }
           }
         }
@@ -69,23 +69,23 @@ 
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6)] = t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
         }
       }
     }
   }
   
   if ($type == 'flag_friend' && module_exists('flag_friend')) {
-    foreach($types as $type_name => $type) {
+    foreach ($types as $type_name => $type) {
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6)] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
 
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6)] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
         }
       }
     }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       foreach($types as $type_name => $type) {
         if (isset($object)) {
           $profile = content_profile_load($type_name, $object->uid);
-        }
-        else {
+        } else {
           global $user;
           $profile = content_profile_load($type_name, $user->uid);
         }

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

@@ -11,7 +11,7 @@
 /**
  * Implementation of hook_token_values().
  */
-function content_profile_tokens_token_values($type, $object = NULL, $options = array()) {
+function content_profile_tokens_token_values($type, $object = null, $options = array()) {
   $values = array();
   $types = content_profile_get_types('types');
   switch ($type) {

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

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 +6 added lines, -11 removed lines

@@ -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;
@@ -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',

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

@@ -94,7 +94,7 @@ 
   if ($user->uid == $account->uid || user_access('administer nodes') ){
     return node_access('create', $type);
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -138,7 +138,7 @@ 
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
     '#description' => t('Customize the display of this content profile.'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
   );
   $form['display']['user_display'] = array(
     '#type' => 'radios',
@@ -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) {
@@ -261,21 +261,21 @@ 
       '#type' => 'fieldset',
       '#title' => t('Content Profile'),
       '#group' => 'additional_settings',
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#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),
+      '#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'])) {
     // 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['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.
@@ -288,7 +288,7 @@ 
 /**
  * Implementation of hook_user().
  */
-function content_profile_user($op, &$edit, &$account, $category = NULL) {
+function content_profile_user($op, &$edit, &$account, $category = null) {
   global $user;
 
   switch ($op) {
@@ -374,7 +374,7 @@ 
 /**
  * Implementation of hook_nodeapi().
  */
-function content_profile_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+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') {
     // Check if this nodetype already exists
@@ -478,18 +478,18 @@ 
  * @param $reset
  *   Optional. If set, the cache is reset.
  */
-function content_profile_load($type, $uid, $lang = '', $reset = NULL) {
+function content_profile_load($type, $uid, $lang = '', $reset = null) {
   static $cache = array();
 
   if (!isset($cache[$type][$uid][$lang]) || $reset) {
-    $cache[$type][$uid][$lang] = FALSE;
+    $cache[$type][$uid][$lang] = false;
     $params = array('type' => $type, 'uid' => $uid);
-    if ($node = node_load($lang ? $params + array('language' => $lang) : $params, NULL, $reset)) {
+    if ($node = node_load($lang ? $params + array('language' => $lang) : $params, null, $reset)) {
       $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;
 }
 
 /**
@@ -563,7 +563,7 @@ 
   $return = array(
     'content_profile_display_view' => array(
       'template'  => 'content_profile-display-view',
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
       'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_add_link' => array(
@@ -581,7 +581,7 @@ 
   );
   if (module_exists('pageroute')) {
     $return['content_profile_pageroute_empty']  = array(
-      'arguments' => array('type_name' => NULL),
+      'arguments' => array('type_name' => null),
     	'file' => 'content_profile.pageroute.inc',
     );
   }

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.rules.inc

Indentation +28 added lines, -28 removed lines

@@ -10,79 +10,79 @@ 
  * Implementation of hook_rules_condition_info().
  */
 function content_profile_rules_condition_info() {
-  return array(
+    return array(
     'content_profile_user_has_profile_condition' => array(
-      'label' => t('User has content profile'),
-      'arguments' => array(
+        'label' => t('User has content profile'),
+        'arguments' => array(
         'user' => array('type' => 'user', 'label' => t('User')),
-      ),
-      'module' => 'Content Profile',
+        ),
+        'module' => 'Content Profile',
     ),
-  );
+    );
 }
 
 function content_profile_user_has_profile_condition($user, $settings) {
-  $node = content_profile_load($settings['type'], $user->uid);
-  return (bool)$node;
+    $node = content_profile_load($settings['type'], $user->uid);
+    return (bool)$node;
 }
 
 function content_profile_user_has_profile_condition_form($settings, &$form) {
-  $settings += array('type' => array());
-  $form['settings']['type'] = array(
+    $settings += array('type' => array());
+    $form['settings']['type'] = array(
     '#type' => 'select',
     '#title' => t('Content Profile Content Type'),
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to check for.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_profile_user_has_profile_condition_label($settings, $argument_labels) {
-  return t('@user has his @type created', $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
+    return t('@user has his @type created', $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
 }
 
 /**
  * Implementation of hook_rules_action_info().
  */
 function content_profile_rules_action_info() {
-  return array(
+    return array(
     'content_profile_action_load' => array(
-      'label' => t('Load Content Profile'),
-      'arguments' => array(
+        'label' => t('Load Content Profile'),
+        'arguments' => array(
         'user' => array('type' => 'user', 'label' => t('User, whose profile should be loaded')),
-      ),
-      'new variables' => array(
+        ),
+        'new variables' => array(
         'profile_node' => array('type' => 'node', 'label' => t('Content Profile')),
-      ),
-      'module' => 'Content Profile',
+        ),
+        'module' => 'Content Profile',
     ),
-  );
+    );
 }
 
 /**
  * Loads a Content Profile
  */
 function content_profile_action_load($user, $settings) {
-  if ($node = content_profile_load($settings['type'], $user->uid)) {
+    if ($node = content_profile_load($settings['type'], $user->uid)) {
     return array('profile_node' => $node);
-  }
+    }
 }
 
 function content_profile_action_load_form($settings, &$form) {
-  $settings += array('type' => array());
-  $form['settings']['type'] = array(
+    $settings += array('type' => array());
+    $form['settings']['type'] = array(
     '#type' => 'select',
     '#title' => t('Content Profile Content Type'),
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to load.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_profile_action_load_label($settings, $argument_labels) {
-  return t("Load @user's @type", $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
+    return t("Load @user's @type", $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
 }
 
 
@@ -90,8 +90,8 @@ 
  * Support upgrading from nodeprofile-workflow-ng integration.
  */
 function nodeprofile_user_has_profile_condition_upgrade(&$element) {
-  $element['#name'] = 'content_profile_user_has_profile_condition';
+    $element['#name'] = 'content_profile_user_has_profile_condition';
 }
 function nodeprofile_action_load_upgrade(&$element) {
-  $element['#name'] = 'content_profile_action_load';
+    $element['#name'] = 'content_profile_action_load';
 }

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

@@ -34,7 +34,7 @@ 
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to check for.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 
@@ -77,7 +77,7 @@ 
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to load.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 

drupal/sites/default/boinc/modules/contrib/content_profile/views/content_profile_views_handler_relationship.inc

Indentation +24 added lines, -24 removed lines

@@ -6,46 +6,46 @@ 
  * Specialized relationship handler to adding content profiles.
  */
 class content_profile_views_handler_relationship extends views_handler_relationship {
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
 
     $options['type'] = array('default' => '');
     return $options;
-  }
+    }
 
-  /**
-   * Adds a form element for choosing the right content type.
-   */
-  function options_form(&$form, &$form_state) {
+    /**
+     * Adds a form element for choosing the right content type.
+     */
+    function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['type'] = array(
-      '#type' => 'radios',
-      '#title' => t('Content type'),
-      '#default_value' => $this->options['type'],
-      '#options' => content_profile_get_types('names'),
-      '#required' => TRUE,
+        '#type' => 'radios',
+        '#title' => t('Content type'),
+        '#default_value' => $this->options['type'],
+        '#options' => content_profile_get_types('names'),
+        '#required' => TRUE,
     );
-  }
+    }
 
-  /**
-   * Called to implement a relationship in a query.
-   */
-  function query() {
+    /**
+     * Called to implement a relationship in a query.
+     */
+    function query() {
     // Figure out what base table this relationship brings to the party.
     $join = new views_join();
     $join->definition = array(
-      'table' => 'node',
-      'field' => 'uid',
-      'left_table' => !empty($this->relationship) ? $this->relationship : 'users',
-      'left_field' => 'uid',
-      'extra' => array(
+        'table' => 'node',
+        'field' => 'uid',
+        'left_table' => !empty($this->relationship) ? $this->relationship : 'users',
+        'left_field' => 'uid',
+        'extra' => array(
         array('field' => 'type', 'value' => $this->options['type']),
-      ),
+        ),
     );
 
     if (!empty($this->options['required'])) {
-      $join->definition['type'] = 'INNER';
+        $join->definition['type'] = 'INNER';
     }
 
     $join->construct();
@@ -53,5 +53,5 @@ 
 
     $alias = $join->definition['table'] .'_'. $join->definition['left_table'];
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     $join->construct();
     $this->ensure_my_table();
 
-    $alias = $join->definition['table'] .'_'. $join->definition['left_table'];
+    $alias = $join->definition['table'].'_'.$join->definition['left_table'];
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
   }
 }

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

@@ -24,7 +24,7 @@
       '#title' => t('Content type'),
       '#default_value' => $this->options['type'],
       '#options' => content_profile_get_types('names'),
-      '#required' => TRUE,
+      '#required' => true,
     );
   }
 

drupal/sites/default/boinc/modules/contrib/content_profile/views/content_profile.views.inc

Indentation +13 added lines, -13 removed lines

@@ -10,18 +10,18 @@ 
  * Implementation of hook_views_data_alter().
  */
 function content_profile_views_data_alter(&$data) {
-  // node relationship for profiles
-  $data['users']['content_profile_rel'] = array(
+    // node relationship for profiles
+    $data['users']['content_profile_rel'] = array(
     'group' => t('Node'),
     'title' => t('Content Profile'),
     'help' => t('Create a relationship to a content profile of the user.'),
     'relationship' => array(
-      'handler' => 'content_profile_views_handler_relationship',
-      'base' => 'node',
-      'base field' => 'uid',
-      'label' => t('Content Profile'),
+        'handler' => 'content_profile_views_handler_relationship',
+        'base' => 'node',
+        'base field' => 'uid',
+        'label' => t('Content Profile'),
     ),
-  );
+    );
 }
 
 
@@ -29,14 +29,14 @@ 
  * Implementation of hook_views_handlers().
  */
 function content_profile_views_handlers() {
-  return array(
-  'info' => array(
+    return array(
+    'info' => array(
     'path' => drupal_get_path('module', 'content_profile') .'/views',
     ),
-  'handlers' => array(
+    'handlers' => array(
     'content_profile_views_handler_relationship' => array(
-     'parent' => 'views_handler_relationship',
-     ),
+        'parent' => 'views_handler_relationship',
+        ),
     ),
-  );
+    );
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 function content_profile_views_handlers() {
   return array(
   'info' => array(
-    'path' => drupal_get_path('module', 'content_profile') .'/views',
+    'path' => drupal_get_path('module', 'content_profile').'/views',
     ),
   'handlers' => array(
     'content_profile_views_handler_relationship' => array(

drupal/sites/default/boinc/modules/contrib/content_profile/panels/relationships/node_from_user.inc

Indentation +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
  * Implementation of specially named hook_ctools_relationships().
  */
 function content_profile_node_from_user_ctools_relationships() {
-  $args['node_from_user'] = array(
+    $args['node_from_user'] = array(
     'title' => t("Profile Node"),
     'keyword' => 'content_profile',
     'description' => t('Adds a Content Profile from user context'),
@@ -19,49 +19,49 @@ 
     'context' => 'content_profile_node_from_user_ctools_context',
     'settings form' => 'content_profile_node_from_user_ctools_settings_form',
     'settings form validate' => 'content_profile_node_from_user_ctools_settings_form_validate',
-  );
+    );
   
-  return $args;
+    return $args;
 }
 
 /**
  * Return a new context based on an existing context.
  */
 function content_profile_node_from_user_ctools_context($context, $conf) {
-  // If unset it wants a generic, unfilled context, which is just NULL.
-  if (empty($context->data) || !isset($context->data->uid)) {
+    // If unset it wants a generic, unfilled context, which is just NULL.
+    if (empty($context->data) || !isset($context->data->uid)) {
     $new_context = ctools_context_create_empty('node', NULL);
-  }
-  else {
+    }
+    else {
     // Load the node for the requested type
     $uid = $context->data->uid;
     $content_profile_node = content_profile_load($conf['type'], $uid);
 
     // Send it to ctools.
     $new_context = ctools_context_create('node', $content_profile_node);
-  }
+    }
 
-  // Have content profile relationships limit CCK field availability.
-  if (isset($new_context->restrictions['type'])) {
+    // Have content profile relationships limit CCK field availability.
+    if (isset($new_context->restrictions['type'])) {
     $new_context->restrictions['type'][] = $conf['type'];
-  }
-  else {
+    }
+    else {
     $new_context->restrictions['type'] = array($conf['type']);
-  }
-  return $new_context;
+    }
+    return $new_context;
 }
 
 /**
  * Settings form for the relationship
  */
 function content_profile_node_from_user_ctools_settings_form($conf) {
-  $options = content_profile_get_types('names');
-  $form['type'] = array(
+    $options = content_profile_get_types('names');
+    $form['type'] = array(
     '#type' => 'select',
     '#title' => t('Relationship type'),
     '#options' => $options,
     '#default_value' => $conf['type']
-  );
+    );
 
-  return $form;
+    return $form;
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -31,8 +31,7 @@ 
   // If unset it wants a generic, unfilled context, which is just NULL.
   if (empty($context->data) || !isset($context->data->uid)) {
     $new_context = ctools_context_create_empty('node', NULL);
-  }
-  else {
+  } else {
     // Load the node for the requested type
     $uid = $context->data->uid;
     $content_profile_node = content_profile_load($conf['type'], $uid);
@@ -44,8 +43,7 @@ 
   // Have content profile relationships limit CCK field availability.
   if (isset($new_context->restrictions['type'])) {
     $new_context->restrictions['type'][] = $conf['type'];
-  }
-  else {
+  } else {
     $new_context->restrictions['type'] = array($conf['type']);
   }
   return $new_context;

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

@@ -30,7 +30,7 @@
 function content_profile_node_from_user_ctools_context($context, $conf) {
   // If unset it wants a generic, unfilled context, which is just NULL.
   if (empty($context->data) || !isset($context->data->uid)) {
-    $new_context = ctools_context_create_empty('node', NULL);
+    $new_context = ctools_context_create_empty('node', null);
   }
   else {
     // Load the node for the requested type

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.theme_vars.inc

Indentation +69 added lines, -69 removed lines

@@ -11,109 +11,109 @@
  */
 class content_profile_theme_variables {
 
-  var $uid;
-  var $_cache = array();
+    var $uid;
+    var $_cache = array();
 
-  function content_profile_theme_variables($uid) {
+    function content_profile_theme_variables($uid) {
     $this->uid = $uid;
-  }
+    }
 
-  /**
-   * Gets the user id of the profiles owner.
-   */
-  function get_uid() {
+    /**
+     * Gets the user id of the profiles owner.
+     */
+    function get_uid() {
     return $uid;
-  }
+    }
 
-  /**
-   * Gets all type names keyed with their machine readable names.
-   */
-  function get_profile_types() {
+    /**
+     * Gets all type names keyed with their machine readable names.
+     */
+    function get_profile_types() {
     return content_profile_get_types('names');
-  }
+    }
 
-  /**
-   * Gets all template variables for the content profile of this type.
-   *
-   * @param $type
-   *   The type of the user's content profile
-   * @param $teaser
-   *   Whether the value is to be generated for the teaser.
-   * @param $page
-   *   Whether the value is to be generated for the page view.
-   *
-   * @return
-   *   An array of variables available for the profile node
-   *   or FALSE if there has been no profile created yet.
-   */
-  function get_variables($type, $teaser = FALSE, $page = FALSE) {
+    /**
+     * Gets all template variables for the content profile of this type.
+     *
+     * @param $type
+     *   The type of the user's content profile
+     * @param $teaser
+     *   Whether the value is to be generated for the teaser.
+     * @param $page
+     *   Whether the value is to be generated for the page view.
+     *
+     * @return
+     *   An array of variables available for the profile node
+     *   or FALSE if there has been no profile created yet.
+     */
+    function get_variables($type, $teaser = FALSE, $page = FALSE) {
     if (!isset($this->_cache[$type][$teaser][$page])) {
-      $this->_cache[$type][$teaser][$page] = FALSE;
+        $this->_cache[$type][$teaser][$page] = FALSE;
 
-      if ($node = content_profile_load($type, $this->uid)) {
+        if ($node = content_profile_load($type, $this->uid)) {
         // Make sure the node is prepared for viewing
         $node = node_build_content($node, $teaser, $page);
         $vars = array('node' => $node, 'teaser' => $teaser, 'page' => $page);
 
         // Apply all node template preprocessors
         foreach ($this->_get_node_preprocessors() as $function) {
-          if (function_exists($function)) {
+            if (function_exists($function)) {
             $function($vars, 'node');
-          }
+            }
         }
         $this->_cache[$type][$teaser][$page] = $vars;
-      }
+        }
     }
     return $this->_cache[$type][$teaser][$page];
-  }
+    }
 
-  /**
-   * Gets a single template variable for the content profile of this type.
-   *
-   * @param $type
-   *   The type of the user's content profile
-   * @param $name
-   *   The name of the variable to get.
-   *
-   * @return
-   *   The variable or FALSE if there has been no profile created yet.
-   */
-  function get_variable($type, $name) {
+    /**
+     * Gets a single template variable for the content profile of this type.
+     *
+     * @param $type
+     *   The type of the user's content profile
+     * @param $name
+     *   The name of the variable to get.
+     *
+     * @return
+     *   The variable or FALSE if there has been no profile created yet.
+     */
+    function get_variable($type, $name) {
     if ($vars = $this->get_variables($type)) {
-      return $vars[$name];
+        return $vars[$name];
     }
     return FALSE;
-  }
+    }
 
 
-  /**
-   * Generate a display of the given node.
-   *
-   * @param $type
-   *   The type of the user's content profile
-   * @param $teaser
-   *   Whether to display the teaser only or the full form.
-   * @param $page
-   *   Whether the node is being displayed by itself as a page.
-   * @param $links
-   *   Whether or not to display node links. Links are omitted for node previews.
-   *
-   * @return
-   *   An HTML representation of the themed node or FALSE if there has been no profile created yet.
-   */
-  function get_view($type, $teaser = FALSE, $page = FALSE, $links = TRUE) {
+    /**
+     * Generate a display of the given node.
+     *
+     * @param $type
+     *   The type of the user's content profile
+     * @param $teaser
+     *   Whether to display the teaser only or the full form.
+     * @param $page
+     *   Whether the node is being displayed by itself as a page.
+     * @param $links
+     *   Whether or not to display node links. Links are omitted for node previews.
+     *
+     * @return
+     *   An HTML representation of the themed node or FALSE if there has been no profile created yet.
+     */
+    function get_view($type, $teaser = FALSE, $page = FALSE, $links = TRUE) {
     if ($node = content_profile_load($type, $this->uid)) {
-      return node_view($node, $teaser, $page, $links);
+        return node_view($node, $teaser, $page, $links);
     }
     return FALSE;
-  }
+    }
 
 
-  function _get_node_preprocessors() {
+    function _get_node_preprocessors() {
     $hooks = theme_get_registry();
     $functions = $hooks['node']['preprocess functions'];
     // We don't need 'template_preprocess'
     unset($functions[0]);
     return $functions;
-  }
+    }
 }

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

@@ -46,9 +46,9 @@ 
    *   An array of variables available for the profile node
    *   or FALSE if there has been no profile created yet.
    */
-  function get_variables($type, $teaser = FALSE, $page = FALSE) {
+  function get_variables($type, $teaser = false, $page = false) {
     if (!isset($this->_cache[$type][$teaser][$page])) {
-      $this->_cache[$type][$teaser][$page] = FALSE;
+      $this->_cache[$type][$teaser][$page] = false;
 
       if ($node = content_profile_load($type, $this->uid)) {
         // Make sure the node is prepared for viewing
@@ -82,7 +82,7 @@ 
     if ($vars = $this->get_variables($type)) {
       return $vars[$name];
     }
-    return FALSE;
+    return false;
   }
 
 
@@ -101,11 +101,11 @@ 
    * @return
    *   An HTML representation of the themed node or FALSE if there has been no profile created yet.
    */
-  function get_view($type, $teaser = FALSE, $page = FALSE, $links = TRUE) {
+  function get_view($type, $teaser = false, $page = false, $links = true) {
     if ($node = content_profile_load($type, $this->uid)) {
       return node_view($node, $teaser, $page, $links);
     }
-    return FALSE;
+    return false;
   }
 
 

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.rules_defaults.inc

Indentation +54 added lines, -54 removed lines

@@ -10,103 +10,103 @@
  * no profile.
  */
 function content_profile_rules_defaults() {
-  $types = array_keys(content_profile_get_types('names'));
-  $type = array_shift($types);
-  $config =
+    $types = array_keys(content_profile_get_types('names'));
+    $type = array_shift($types);
+    $config =
 array (
-  'rules' =>
-  array (
+    'rules' =>
+    array (
     'content_profile_rule_1' =>
     array (
-      '#type' => 'rule',
-      '#set' => 'event_user_login',
-      '#label' => 'Redirect to profile creation page, if users have no profile.',
-      '#active' => 0,
-      '#weight' => '0',
-      '#conditions' =>
-      array (
+        '#type' => 'rule',
+        '#set' => 'event_user_login',
+        '#label' => 'Redirect to profile creation page, if users have no profile.',
+        '#active' => 0,
+        '#weight' => '0',
+        '#conditions' =>
+        array (
         0 =>
         array (
-          '#negate' => 1,
-          '#weight' => 0,
-          '#info' =>
-          array (
+            '#negate' => 1,
+            '#weight' => 0,
+            '#info' =>
+            array (
             'label' => 'Logged in user has his Profile created',
             'arguments' =>
             array (
-              'user' =>
-              array (
+                'user' =>
+                array (
                 'type' => 'user',
                 'label' => 'User',
-              ),
+                ),
             ),
             'module' => 'Content Profile',
-          ),
-          '#name' => 'content_profile_user_has_profile_condition',
-          '#settings' =>
-          array (
+            ),
+            '#name' => 'content_profile_user_has_profile_condition',
+            '#settings' =>
+            array (
             'type' => $type,
             '#argument map' =>
             array (
-              'account' => 'user',
+                'account' => 'user',
             ),
-          ),
-          '#type' => 'condition',
+            ),
+            '#type' => 'condition',
+        ),
         ),
-      ),
-      '#actions' =>
-      array (
+        '#actions' =>
+        array (
         0 =>
         array (
-          '#type' => 'action',
-          '#settings' =>
-          array (
+            '#type' => 'action',
+            '#settings' =>
+            array (
             'path' => 'node/add/'. str_replace('_', '-', $type),
             'query' => '',
             'fragment' => '',
             'force' => 1,
             'override' => 1,
-          ),
-          '#name' => 'rules_action_drupal_goto',
-          '#info' =>
-          array (
+            ),
+            '#name' => 'rules_action_drupal_goto',
+            '#info' =>
+            array (
             'label' => 'Redirect to profile creation page',
             'label callback' => false,
             'module' => 'System',
             'eval input' =>
             array (
-              0 => 'path',
-              1 => 'query',
-              2 => 'fragment',
+                0 => 'path',
+                1 => 'query',
+                2 => 'fragment',
+            ),
             ),
-          ),
-          '#weight' => 0,
+            '#weight' => 0,
         ),
         1 =>
         array (
-          '#weight' => 0,
-          '#info' =>
-          array (
+            '#weight' => 0,
+            '#info' =>
+            array (
             'label' => 'Show a message',
             'label callback' => false,
             'module' => 'System',
             'eval input' =>
             array (
-              0 => 'message',
+                0 => 'message',
+            ),
             ),
-          ),
-          '#name' => 'rules_action_drupal_message',
-          '#settings' =>
-          array (
+            '#name' => 'rules_action_drupal_message',
+            '#settings' =>
+            array (
             'message' => 'You haven\'t filled out your profile information yet. Please do so now!',
             'error' => 1,
-          ),
-          '#type' => 'action',
+            ),
+            '#type' => 'action',
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 
-  return $config;
+    return $config;
 }

Spacing +20 added lines, -20 removed lines

@@ -13,29 +13,29 @@ 
   $types = array_keys(content_profile_get_types('names'));
   $type = array_shift($types);
   $config =
-array (
+array(
   'rules' =>
-  array (
+  array(
     'content_profile_rule_1' =>
-    array (
+    array(
       '#type' => 'rule',
       '#set' => 'event_user_login',
       '#label' => 'Redirect to profile creation page, if users have no profile.',
       '#active' => 0,
       '#weight' => '0',
       '#conditions' =>
-      array (
+      array(
         0 =>
-        array (
+        array(
           '#negate' => 1,
           '#weight' => 0,
           '#info' =>
-          array (
+          array(
             'label' => 'Logged in user has his Profile created',
             'arguments' =>
-            array (
+            array(
               'user' =>
-              array (
+              array(
                 'type' => 'user',
                 'label' => 'User',
               ),
@@ -44,10 +44,10 @@ 
           ),
           '#name' => 'content_profile_user_has_profile_condition',
           '#settings' =>
-          array (
+          array(
             'type' => $type,
             '#argument map' =>
-            array (
+            array(
               'account' => 'user',
             ),
           ),
@@ -55,13 +55,13 @@ 
         ),
       ),
       '#actions' =>
-      array (
+      array(
         0 =>
-        array (
+        array(
           '#type' => 'action',
           '#settings' =>
-          array (
-            'path' => 'node/add/'. str_replace('_', '-', $type),
+          array(
+            'path' => 'node/add/'.str_replace('_', '-', $type),
             'query' => '',
             'fragment' => '',
             'force' => 1,
@@ -69,12 +69,12 @@ 
           ),
           '#name' => 'rules_action_drupal_goto',
           '#info' =>
-          array (
+          array(
             'label' => 'Redirect to profile creation page',
             'label callback' => false,
             'module' => 'System',
             'eval input' =>
-            array (
+            array(
               0 => 'path',
               1 => 'query',
               2 => 'fragment',
@@ -83,21 +83,21 @@ 
           '#weight' => 0,
         ),
         1 =>
-        array (
+        array(
           '#weight' => 0,
           '#info' =>
-          array (
+          array(
             'label' => 'Show a message',
             'label callback' => false,
             'module' => 'System',
             'eval input' =>
-            array (
+            array(
               0 => 'message',
             ),
           ),
           '#name' => 'rules_action_drupal_message',
           '#settings' =>
-          array (
+          array(
             'message' => 'You haven\'t filled out your profile information yet. Please do so now!',
             'error' => 1,
           ),