| @@ -42,8 +42,7 @@ | ||
| 42 | 42 |    if (is_array($element)) { | 
| 43 | 43 | show($element); | 
| 44 | 44 | return drupal_render($element); | 
| 45 | - } | |
| 46 | -  else { | |
| 45 | +  } else { | |
| 47 | 46 | // Safe-guard for inappropriate use of render() on flat variables: return | 
| 48 | 47 | // the variable as-is. | 
| 49 | 48 | return $element; | 
| @@ -131,8 +131,7 @@ discard block | ||
| 131 | 131 |          if ($comment->uid == 0 || strlen($comment->name) == 0) { | 
| 132 | 132 | // @see user_validate_name(). !'0' === TRUE. | 
| 133 | 133 | $comment_document->ss_name = '0'; | 
| 134 | - } | |
| 135 | -        else { | |
| 134 | +        } else { | |
| 136 | 135 | $comment_document->ss_name = $comment->name; | 
| 137 | 136 | // We want the name to be searchable for keywords. | 
| 138 | 137 | $comment_document->tos_name = $comment->name; | 
| @@ -318,8 +317,7 @@ discard block | ||
| 318 | 317 | $solr->deleteByQuery($query); | 
| 319 | 318 | // Log the query used for deletion. | 
| 320 | 319 |      watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO); | 
| 321 | - } | |
| 322 | -  catch (Exception $e) { | |
| 320 | +  } catch (Exception $e) { | |
| 323 | 321 |        watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR); | 
| 324 | 322 | return FALSE; | 
| 325 | 323 | }// try | 
| @@ -376,8 +374,7 @@ discard block | ||
| 376 | 374 | $solr->deleteByQuery($query); | 
| 377 | 375 | // Log the query used for deletion. | 
| 378 | 376 |      watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO); | 
| 379 | - } | |
| 380 | -  catch (Exception $e) { | |
| 377 | +    } catch (Exception $e) { | |
| 381 | 378 |      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR); | 
| 382 | 379 | return FALSE; | 
| 383 | 380 | }// try | 
| @@ -220,8 +220,7 @@ discard block | ||
| 220 | 220 |    if (!$values['boinc_translate_transifex_pass']) { | 
| 221 | 221 |      if (!variable_get('boinc_translate_transifex_pass', '')) { | 
| 222 | 222 |        form_set_error('boinc_translate_transifex_pass', t('Password is required.')); | 
| 223 | - } | |
| 224 | -    else { | |
| 223 | +    } else { | |
| 225 | 224 | unset($form_state['values']['boinc_translate_transifex_pass']); | 
| 226 | 225 | } | 
| 227 | 226 | } | 
| @@ -260,8 +259,7 @@ discard block | ||
| 260 | 259 | 'boinc_translate_transifex_pass', | 
| 261 | 260 |            t('Transifex authentication failed.') | 
| 262 | 261 | ); | 
| 263 | - } | |
| 264 | -      else { | |
| 262 | +      } else { | |
| 265 | 263 | $authenticated = TRUE; | 
| 266 | 264 | } | 
| 267 | 265 | } | 
| @@ -278,14 +276,12 @@ discard block | ||
| 278 | 276 | ); | 
| 279 | 277 |        if ($project_name AND $project_resources) { | 
| 280 | 278 | $transifex_resources[$project_name] = $project_resources; | 
| 281 | - } | |
| 282 | -      elseif ($project_name AND !$project_resources) { | |
| 279 | +      } elseif ($project_name AND !$project_resources) { | |
| 283 | 280 | drupal_set_message( | 
| 284 | 281 |            t('No project-specific resources were provided'), | 
| 285 | 282 | 'warning' | 
| 286 | 283 | ); | 
| 287 | - } | |
| 288 | -      elseif ($project_resources AND !$project_name) { | |
| 284 | +      } elseif ($project_resources AND !$project_name) { | |
| 289 | 285 | drupal_set_message( | 
| 290 | 286 |            t('No project-specific Transifex project name was provided'), | 
| 291 | 287 | 'warning' | 
| @@ -157,13 +157,11 @@ discard block | ||
| 157 | 157 |    if (!$values['boinc_root_dir']) { | 
| 158 | 158 |      form_set_error('boinc_root_dir', t('BOINC project root directory must be | 
| 159 | 159 | defined!')); | 
| 160 | - } | |
| 161 | -  elseif (!is_dir($values['boinc_root_dir'])) { | |
| 160 | +  } elseif (!is_dir($values['boinc_root_dir'])) { | |
| 162 | 161 |      form_set_error('boinc_root_dir', t('BOINC project root not found at %directory', | 
| 163 | 162 |        array('%directory' => $values['boinc_root_dir']) | 
| 164 | 163 | )); | 
| 165 | - } | |
| 166 | -  else { | |
| 164 | +  } else { | |
| 167 | 165 | // By default, try to automatically set specific directories from the root | 
| 168 | 166 |      if (!$values['boinc_config_xml_dir']) { | 
| 169 | 167 | $values['boinc_config_xml_dir'] = $values['boinc_root_dir']; | 
| @@ -285,8 +283,7 @@ discard block | ||
| 285 | 283 |    if (!$values['boinc_scheduler_urls']) { | 
| 286 | 284 |      form_set_error('boinc_scheduler_urls', t('At least one scheduling server | 
| 287 | 285 | URL must be specified.')); | 
| 288 | - } | |
| 289 | -  else { | |
| 286 | +  } else { | |
| 290 | 287 |      $urls = explode("\r\n", $values['boinc_scheduler_urls']); | 
| 291 | 288 |      foreach ($urls as $key => $url) { | 
| 292 | 289 |        if (!$url) { | 
| @@ -7,11 +7,9 @@ | ||
| 7 | 7 | list($module, $api) = func_get_args(); | 
| 8 | 8 |    if ($module == "apachesolr" && $api == "apachesolr_environments") { | 
| 9 | 9 |      return array("version" => 1); | 
| 10 | - } | |
| 11 | -  elseif ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") { | |
| 10 | +  } elseif ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") { | |
| 12 | 11 |      return array("version" => 3); | 
| 13 | - } | |
| 14 | -  elseif ($module == "facetapi" && $api == "facetapi_defaults") { | |
| 12 | +  } elseif ($module == "facetapi" && $api == "facetapi_defaults") { | |
| 15 | 13 |      return array("version" => 1); | 
| 16 | 14 | } | 
| 17 | 15 | } | 
| @@ -7,8 +7,7 @@ | ||
| 7 | 7 | list($module, $api) = func_get_args(); | 
| 8 | 8 |    if ($module == "context" && $api == "context") { | 
| 9 | 9 |      return array("version" => 3); | 
| 10 | - } | |
| 11 | -  elseif ($module == "strongarm" && $api == "strongarm") { | |
| 10 | +  } elseif ($module == "strongarm" && $api == "strongarm") { | |
| 12 | 11 |      return array("version" => 1); | 
| 13 | 12 | } | 
| 14 | 13 | } | 
| @@ -26,8 +26,7 @@ discard block | ||
| 26 | 26 | |
| 27 | 27 |    if (isset($roles[$rid]) AND $roles[$rid] == $better_name) { | 
| 28 | 28 | // Life is good | 
| 29 | - } | |
| 30 | -  else { | |
| 29 | +  } else { | |
| 31 | 30 | $better_rid = array_search($better_name, $roles); | 
| 32 | 31 |      $old_rid = array_search('Forum Moderator', $roles); | 
| 33 | 32 |      if (!$better_rid) { | 
| @@ -36,8 +35,7 @@ discard block | ||
| 36 | 35 | $better_name, $old_rid); | 
| 37 | 36 | $better_rid = $old_rid; | 
| 38 | 37 | $old_rid = NULL; | 
| 39 | - } | |
| 40 | -      else { | |
| 38 | +      } else { | |
| 41 | 39 |          drupal_set_message(t('The Forum Access module is not set up right. Try disabling the Discussion Forums feature and then manually uninstall the Forum Access module before enabling Discussion Forums again.', 'error')); | 
| 42 | 40 | } | 
| 43 | 41 | } | 
| @@ -7,11 +7,9 @@ | ||
| 7 | 7 | list($module, $api) = func_get_args(); | 
| 8 | 8 |    if ($module == "context" && $api == "context") { | 
| 9 | 9 |      return array("version" => 3); | 
| 10 | - } | |
| 11 | -  elseif ($module == "page_manager" && $api == "pages_default") { | |
| 10 | +  } elseif ($module == "page_manager" && $api == "pages_default") { | |
| 12 | 11 |      return array("version" => 1); | 
| 13 | - } | |
| 14 | -  elseif ($module == "strongarm" && $api == "strongarm") { | |
| 12 | +  } elseif ($module == "strongarm" && $api == "strongarm") { | |
| 15 | 13 |      return array("version" => 1); | 
| 16 | 14 | } | 
| 17 | 15 | } | 
| @@ -7,8 +7,7 @@ | ||
| 7 | 7 | list($module, $api) = func_get_args(); | 
| 8 | 8 |    if ($module == "page_manager" && $api == "pages_default") { | 
| 9 | 9 |      return array("version" => 1); | 
| 10 | - } | |
| 11 | -  elseif ($module == "strongarm" && $api == "strongarm") { | |
| 10 | +  } elseif ($module == "strongarm" && $api == "strongarm") { | |
| 12 | 11 |      return array("version" => 1); | 
| 13 | 12 | } | 
| 14 | 13 | } |