BOINC / boinc

drupal/sites/default/settings.php

Braces +2 added lines, -1 removed lines

@@ -91,8 +91,9 @@
  *   $db_url = 'pgsql://username:password@localhost/databasename';
  */
 require_once('dbconfig.php');
-if (!isset($dbserver) || empty($dbserver))
+if (!isset($dbserver) || empty($dbserver)) {
   $dbserver='localhost';
+}
 $db_url = array(
   'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
   'boinc' => "{$boinc_dbtype}://{$boinc_dbuser}:".urlencode($boinc_dbpass)."@{$boinc_dbserver}/{$boinc_dbname}"

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

Braces +7 added lines, -9 removed lines

@@ -94,15 +94,16 @@ 
         // Use the menu label as the default block subject
         $menus = menu_get_menus();
         $subject = $menus[$jumpmenu_name];
-      }
-      else if ($jumpmenu_type == 'taxo') {
+      } else if ($jumpmenu_type == 'taxo') {
         $form = jump_quickly($jumpmenu_name, 'taxo', $active);
 
         // Use the vocabulary name as the default block subject
         $vocab = taxonomy_vocabulary_load($jumpmenu_name);
         $subject = $vocab->name;
       }
-      if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+      if (variable_get('jump_use_js_' . $delta, 0) === 1) {
+          drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+      }
       return array('subject' => $subject, 'content' => $form);
       break;
   }
@@ -137,13 +138,11 @@ 
 
   if (is_array($name)) {
     $options = $name;
-  }
-  else {
+  } else {
     $options = array();
     if ($type == 'menu') {
       jump_menu_get_menu_options($options, $name);
-    }
-    elseif ($type == 'taxo') {
+    } elseif ($type == 'taxo') {
       jump_menu_get_taxo_options($options, $name);
     }
   }
@@ -215,8 +214,7 @@ 
     $fragment = explode('#', $form_state['values']['jump_goto']);
     if (isset($fragment[1])) {
       drupal_goto($fragment[0], NULL, $fragment[1]);
-    }
-    else {
+    } else {
       drupal_goto($form_state['values']['jump_goto']);
     }
   }

drupal/sites/default/boinc/modules/contrib/jump/jump_views_plugin_style.inc

Braces +2 added lines, -4 removed lines

@@ -76,8 +76,7 @@ 
     foreach ($handlers as $field => $handler) {
       if ($label = $handler->label()) {
         $field_names[$field] = $label;
-      }
-      else {
+      } else {
         $field_names[$field] = $handler->ui_name();
       }
     }
@@ -125,8 +124,7 @@ 
       $map = array_flip($this->field_map);
       if (isset($row->$map[$field])) {
         $tokens["[$field]"] = $row->$map[$field];
-      }
-      else {
+      } else {
         $tokens["[$field]"] = '';
       }
     }

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

Braces +18 added lines, -36 removed lines

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

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

Braces +4 added lines, -8 removed lines

@@ -49,23 +49,20 @@ 
   foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
     if (!is_numeric($tid)) {
       $options[$tid] = $name;
-    }
-    elseif (is_object($name)) {
+    } elseif (is_object($name)) {
       foreach ($name->option as $sub_tid => $sub_name) {
         if (!empty($tids[$sub_tid])) {
           $options[$tid]->option[$sub_tid] = $sub_name;
         }
       }
-    }
-    elseif ($tids[$tid]) {
+    } elseif ($tids[$tid]) {
       $options[$tid] = $name;
     }
   }
 
   if ($options) {
     $form['taxonomy'][$vid]['#options'] = $options;
-  }
-  else {
+  } else {
     unset($form['taxonomy'][$vid]);
   }
 
@@ -135,8 +132,7 @@ 
                 }
             break;
         }//switch arg(0)
-      }
-      else {
+      } else {
         if (isset($form['admin']) && !empty($user->_forum_access_moderator)) {
           foreach (element_children($form['admin']) as $key) {
             if ($key != 'status') {

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

Braces +16 added lines, -32 removed lines

@@ -38,8 +38,7 @@ 
   if (isset($node->comment_target_nid)) {
     if ($changed_tid = _forum_access_changed_tid()) {
       $tid = $changed_tid; // the topic node hasn't been saved yet!
-    }
-    else {
+    } else {
       $node = node_load($node->comment_target_nid);
       $tid = _forum_access_get_tid($node);
     }
@@ -190,44 +189,34 @@ 
   if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
-  }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+  } elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
-  }
-  elseif ($form_id == 'forum_overview') {
+  } elseif ($form_id == 'forum_overview') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_overview($form, $form_state);
-  }
-  elseif ($form_id == 'forum_form_container') {
+  } elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, TRUE);
-  }
-  elseif ($form_id == 'forum_form_forum') {
+  } elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, FALSE);
-  }
-  elseif ($form_id == 'forum_admin_settings') {
+  } elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_admin_settings_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_role') {
+  } elseif ($form_id == 'user_admin_role') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_role_form($form, $form_state);
-  }
-  elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
+  } elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_content_access_admin_form();
-  }
-  elseif ($form_id == 'user_admin_perm') {
+  } elseif ($form_id == 'user_admin_perm') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_perm_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_account') {
+  } elseif ($form_id == 'user_admin_account') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_account_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_profile_form') {
+  } elseif ($form_id == 'user_profile_form') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_profile_form($form, $form_state);
   }
@@ -252,8 +241,7 @@ 
       }
       if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
         $required_access = 'create';
-      }
-      else {
+      } else {
         $required_access = 'view';
       }
       $roles = implode(', ', array_keys($user->roles));
@@ -424,8 +412,7 @@ 
           unset($links['quote']);
       }
     }
-  }
-  else {
+  } else {
     // Check links for the comment.
     $required_keys = array(
       'comment_create' => 'comment_reply',
@@ -436,8 +423,7 @@ 
       if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment))) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
-      }
-      elseif (!array_key_exists($key, $links)) {
+      } elseif (!array_key_exists($key, $links)) {
         $link_is_missing = TRUE;
       }
     }
@@ -566,15 +552,13 @@ 
 
     if ($result) {
       $cache[$account->uid][$tid][$type] = 1;
-    }
-    else {
+    } else {
       // check our moderators too
       $acl_id = acl_get_id_by_number('forum_access', $tid);
       $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
       if ($result) {
         $cache[$account->uid][$tid][$type] = 2;
-      }
-      else {
+      } else {
         $cache[$account->uid][$tid][$type] = FALSE;
       }
     }

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

Braces +4 added lines, -8 removed lines

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

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

Braces +6 added lines, -12 removed lines

@@ -102,8 +102,7 @@ 
     if (count($value) > 1) {
       $tname = t($value[0]);
       $predefined[$key] = ($tname == $value[1]) ? $tname : "$tname ($value[1])";
-    }
-    else {
+    } else {
       $predefined[$key] = t($value[0]);
     }
   }
@@ -143,8 +142,7 @@ 
           '#default_value' => !empty($profile->settings['buttons'][$name][$button]) ? $profile->settings['buttons'][$name][$button] : FALSE,
         );
       }
-    }
-    else if (isset($meta['extensions']) && is_array($meta['extensions'])) {
+    } else if (isset($meta['extensions']) && is_array($meta['extensions'])) {
       foreach ($meta['extensions'] as $extension => $title) {
         $form['buttons'][$name][$extension] = array(
           '#type' => 'checkbox',
@@ -334,8 +332,7 @@ 
   // Determine if this is an update.
   if (!db_result(db_query("SELECT 1 FROM {wysiwyg} WHERE format = %d", $format))) {
     $update = array();
-  }
-  else {
+  } else {
     $update = array('format');
   }
   $wysiwyg = new stdClass();
@@ -405,8 +402,7 @@ 
     );
     if ($editor['installed']) {
       $options[$name] = $editor['title'] . (isset($editor['installed version']) ? ' ' . $editor['installed version'] : '');
-    }
-    else {
+    } else {
       // Build on-site installation instructions.
       // @todo Setup $library in wysiwyg_load_editor() already.
       $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
@@ -467,8 +463,7 @@ 
       if ($in_code_only) {
         $form['formats'][$id]['name']['#value'] .= ' <em>(' . t('From: !module module', array('!module' => $profiles[$id]->export_module)) . ')</em>';
       }
-    }
-    else {
+    } else {
       $form['formats'][$id]['editor'] = array(
         '#type' => 'select',
         '#default_value' => '',
@@ -574,8 +569,7 @@ 
   wysiwyg_profile_delete($wysiwyg);
   if (!empty($form_state['values']['revert'])) {
     drupal_set_message(t('Wysiwyg profile settings for %name has been reverted.', array('%name' => $format->name)));
-  }
-  else {
+  } else {
     drupal_set_message(t('Wysiwyg profile for %name has been deleted.', array('%name' => $format->name)));
   }
   $form_state['redirect'] = 'admin/settings/wysiwyg';

drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/fckeditor.inc

Braces +1 added lines, -2 removed lines

@@ -130,8 +130,7 @@
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
       $settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
-    }
-    else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+    } else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
       $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
     }
   }