Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#282405 by Damien Tournoud, lilou, Dave Reid: Enforce coding standard on elseif.

merge-requests/26/head
Angie Byron 2008-10-12 04:30:09 +00:00
parent a765e882eb
commit f76acb2d9d
38 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/cache.inc
View File

@ -168,7 +168,7 @@ function cache_clear_all($cid = NULL, $table = NULL, $wildcard = FALSE) {
// This is the first request to clear the cache, start a timer.
variable_set('cache_flush', REQUEST_TIME);
}
else if (REQUEST_TIME > ($cache_flush + variable_get('cache_lifetime', 0))) {
elseif (REQUEST_TIME > ($cache_flush + variable_get('cache_lifetime', 0))) {
// Clear the cache for everyone, cache_flush_delay seconds have
// passed since the first request to clear the cache.
db_delete($table)

16
includes/common.inc
View File

@ -1247,25 +1247,25 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL
if (strpos('AaDlM', $c) !== FALSE) {
$date .= t(gmdate($c, $timestamp), array(), $langcode);
}
else if ($c == 'F') {
elseif ($c == 'F') {
// Special treatment for long month names: May is both an abbreviation
// and a full month name in English, but other languages have
// different abbreviations.
$date .= trim(t('!long-month-name ' . gmdate($c, $timestamp), array('!long-month-name' => ''), $langcode));
}
else if (strpos('BdgGhHiIjLmnsStTUwWYyz', $c) !== FALSE) {
elseif (strpos('BdgGhHiIjLmnsStTUwWYyz', $c) !== FALSE) {
$date .= gmdate($c, $timestamp);
}
else if ($c == 'r') {
elseif ($c == 'r') {
$date .= format_date($timestamp - $timezone, 'custom', 'D, d M Y H:i:s O', $timezone, $langcode);
}
else if ($c == 'O') {
elseif ($c == 'O') {
$date .= sprintf('%s%02d%02d', ($timezone < 0 ? '-' : '+'), abs($timezone / 3600), abs($timezone % 3600) / 60);
}
else if ($c == 'Z') {
elseif ($c == 'Z') {
$date .= $timezone;
}
else if ($c == '\\') {
elseif ($c == '\\') {
$date .= $format[++$i];
}
else {
@ -1789,7 +1789,7 @@ function drupal_get_css($css = NULL) {
}
// If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*,
// regardless of whether preprocessing is on or off.
else if (!$preprocess && $type == 'theme') {
elseif (!$preprocess && $type == 'theme') {
$no_theme_preprocess .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . base_path() . $file . $query_string . '" />' . "\n";
}
else {
@ -2559,7 +2559,7 @@ function page_set_cache() {
if (zlib_get_coding_type() == 'deflate') {
$cache = FALSE;
}
else if (zlib_get_coding_type() == FALSE) {
elseif (zlib_get_coding_type() == FALSE) {
$data = gzencode($data, 9, FORCE_GZIP);
}
// The remaining case is 'gzip' which means the data is

4
includes/file.inc
View File

@ -128,11 +128,11 @@ function file_create_path($destination = NULL) {
}
// Check if the destination is instead inside the Drupal temporary files
// directory.
else if (file_check_location($destination, file_directory_temp())) {
elseif (file_check_location($destination, file_directory_temp())) {
return $destination;
}
// Not found, try again with prefixed directory path.
else if (file_check_location($file_path . '/' . $destination, $file_path)) {
elseif (file_check_location($file_path . '/' . $destination, $file_path)) {
return $file_path . '/' . $destination;
}
// File not found.

8
includes/form.inc
View File

@ -488,7 +488,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
$form['form_token'] = array('#type' => 'token', '#default_value' => drupal_get_token($form['#token']));
}
}
else if (isset($user->uid) && $user->uid && !$form['#programmed']) {
elseif (isset($user->uid) && $user->uid && !$form['#programmed']) {
$form['#token'] = $form_id;
$form['form_token'] = array(
'#id' => form_clean_id('edit-' . $form_id . '-form-token'),
@ -1375,7 +1375,7 @@ function form_options_flatten($array, $reset = TRUE) {
if (is_object($value)) {
form_options_flatten($value->option, FALSE);
}
else if (is_array($value)) {
elseif (is_array($value)) {
form_options_flatten($value, FALSE);
}
else {
@ -1479,12 +1479,12 @@ function form_get_options($element, $key) {
if (is_array($choice)) {
return FALSE;
}
else if (is_object($choice)) {
elseif (is_object($choice)) {
if (isset($choice->option[$key])) {
$keys[] = $index;
}
}
else if ($index == $key) {
elseif ($index == $key) {
$keys[] = $index;
}
}

2
includes/locale.inc
View File

@ -1320,7 +1320,7 @@ function _locale_import_one_string_db(&$report, $langcode, $source, $translation
db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
$report[0]++;
}
else if ($mode == LOCALE_IMPORT_OVERWRITE) {
elseif ($mode == LOCALE_IMPORT_OVERWRITE) {
// Translation exists, only overwrite if instructed.
db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
$report[1]++;

2
includes/module.inc
View File

@ -476,7 +476,7 @@ function module_invoke_all() {
if (isset($result) && is_array($result)) {
$return = array_merge_recursive($return, $result);
}
else if (isset($result)) {
elseif (isset($result)) {
$return[] = $result;
}
}

2
includes/pager.inc
View File

@ -401,7 +401,7 @@ function theme_pager_link($text, $page_new, $element, $parameters = array(), $at
if (isset($titles[$text])) {
$attributes['title'] = $titles[$text];
}
else if (is_numeric($text)) {
elseif (is_numeric($text)) {
$attributes['title'] = t('Go to page @number', array('@number' => $text));
}
}

6
includes/theme.inc
View File

@ -1128,7 +1128,7 @@ function theme_links($links, $attributes = array('class' => 'links')) {
// Pass in $link as $options, they share the same keys.
$output .= l($link['title'], $link['href'], $link);
}
else if (!empty($link['title'])) {
elseif (!empty($link['title'])) {
// Some links are actually not links, but we wrap these in <span> for adding title and class attributes
if (empty($link['html'])) {
$link['title'] = check_plain($link['title']);
@ -1457,7 +1457,7 @@ function theme_mark($type = MARK_NEW) {
if ($type == MARK_NEW) {
return ' <span class="marker">' . t('new') . '</span>';
}
else if ($type == MARK_UPDATED) {
elseif ($type == MARK_UPDATED) {
return ' <span class="marker">' . t('updated') . '</span>';
}
}
@ -1639,7 +1639,7 @@ function theme_username($object) {
$output = check_plain($name);
}
}
else if ($object->name) {
elseif ($object->name) {
// Sometimes modules display content composed by people who are
// not registered members of the site (e.g. mailing list or news
// aggregator modules). This clause enables modules to display

16
includes/unicode.inc
View File

@ -174,10 +174,10 @@ function drupal_convert_to_utf8($data, $encoding) {
if (function_exists('iconv')) {
$out = @iconv($encoding, 'utf-8', $data);
}
else if (function_exists('mb_convert_encoding')) {
elseif (function_exists('mb_convert_encoding')) {
$out = @mb_convert_encoding($data, 'utf-8', $encoding);
}
else if (function_exists('recode_string')) {
elseif (function_exists('recode_string')) {
$out = @recode_string($encoding . '..utf-8', $data);
}
else {
@ -370,16 +370,16 @@ function _decode_entities($prefix, $codepoint, $original, &$table, &$exclude) {
if ($codepoint < 0x80) {
$str = chr($codepoint);
}
else if ($codepoint < 0x800) {
elseif ($codepoint < 0x800) {
$str = chr(0xC0 | ($codepoint >> 6))
. chr(0x80 | ($codepoint & 0x3F));
}
else if ($codepoint < 0x10000) {
elseif ($codepoint < 0x10000) {
$str = chr(0xE0 | ( $codepoint >> 12))
. chr(0x80 | (($codepoint >> 6) & 0x3F))
. chr(0x80 | ( $codepoint & 0x3F));
}
else if ($codepoint < 0x200000) {
elseif ($codepoint < 0x200000) {
$str = chr(0xF0 | ( $codepoint >> 18))
. chr(0x80 | (($codepoint >> 12) & 0x3F))
. chr(0x80 | (($codepoint >> 6) & 0x3F))
@ -488,7 +488,7 @@ function drupal_substr($text, $start, $length = NULL) {
}
}
}
else if ($start < 0) {
elseif ($start < 0) {
// Count all the continuation bytes from the end until we have found
// abs($start) characters
$start = abs($start);
@ -507,7 +507,7 @@ function drupal_substr($text, $start, $length = NULL) {
if ($length === NULL) {
$bytes = $strlen - 1;
}
else if ($length > 0) {
elseif ($length > 0) {
// Count all the continuation bytes from the starting index until we have
// found $length + 1 characters. Then backtrack one byte.
$bytes = $istart; $chars = 0;
@ -520,7 +520,7 @@ function drupal_substr($text, $start, $length = NULL) {
}
$bytes--;
}
else if ($length < 0) {
elseif ($length < 0) {
// Count all the continuation bytes from the end until we have found
// abs($length) characters
$length = abs($length);

2
modules/aggregator/aggregator.module
View File

@ -801,7 +801,7 @@ function aggregator_parse_feed(&$data, $feed) {
if (!empty($guid)) {
$entry = db_fetch_object(db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = %d AND guid = '%s'", $feed['fid'], $guid));
}
else if ($link && $link != $feed['link'] && $link != $feed['url']) {
elseif ($link && $link != $feed['link'] && $link != $feed['url']) {
$entry = db_fetch_object(db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = %d AND link = '%s'", $feed['fid'], $link));
}
else {

2
modules/blog/blog.pages.inc
View File

@ -19,7 +19,7 @@ function blog_page_user($account) {
if (($account->uid == $user->uid) && user_access('create blog content')) {
$items[] = l(t('Post new blog entry.'), "node/add/blog");
}
else if ($account->uid == $user->uid) {
elseif ($account->uid == $user->uid) {
$items[] = t('You are not allowed to post a new blog entry.');
}

4
modules/comment/comment.pages.inc
View File

@ -88,7 +88,7 @@ function comment_reply($node, $pid = NULL) {
}
}
// This is the case where the comment is in response to a node. Display the node.
else if (user_access('access content')) {
elseif (user_access('access content')) {
$output .= node_view($node);
}
@ -97,7 +97,7 @@ function comment_reply($node, $pid = NULL) {
drupal_set_message(t("This discussion is closed: you can't post new comments."), 'error');
drupal_goto("node/$node->nid");
}
else if (user_access('post comments')) {
elseif (user_access('post comments')) {
$output .= comment_form_box(array('pid' => $pid, 'nid' => $node->nid), t('Reply'));
}
else {

2
modules/contact/contact.pages.inc
View File

@ -160,7 +160,7 @@ function contact_user_page($account) {
if (!valid_email_address($user->mail)) {
$output = t('You need to provide a valid e-mail address to contact other users. Please update your <a href="@url">user information</a> and try again.', array('@url' => url("user/$user->uid/edit", array('query' => 'destination=' . drupal_get_destination()))));
}
else if (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3)) && !user_access('administer site-wide contact form')) {
elseif (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3)) && !user_access('administer site-wide contact form')) {
$output = t("You cannot send more than %number messages per hour. Please try again later.", array('%number' => variable_get('contact_hourly_threshold', 3)));
}
else {

6
modules/filter/filter.module
View File

@ -880,12 +880,12 @@ function _filter_autop($text) {
}
}
// Only allow a matching tag to close it.
else if (!$open && $ignoretag == $tag) {
elseif (!$open && $ignoretag == $tag) {
$ignore = FALSE;
$ignoretag = '';
}
}
else if (!$ignore) {
elseif (!$ignore) {
$chunk = preg_replace('|\n*$|', '', $chunk) . "\n\n"; // just to make things a little easier, pad the end
$chunk = preg_replace('|<br />\s*<br />|', "\n\n", $chunk);
$chunk = preg_replace('!(<' . $block . '[^>]*>)!', "\n$1", $chunk); // Space things out a little
@ -1001,7 +1001,7 @@ function _filter_xss_split($m, $store = FALSE) {
// We matched a lone ">" character
return '&gt;';
}
else if (strlen($string) == 1) {
elseif (strlen($string) == 1) {
// We matched a lone "<" character
return '&lt;';
}

2
modules/filter/filter.test
View File

@ -162,7 +162,7 @@ class FilterAdminTestCase extends DrupalWebTestCase {
if ($format->name == 'Filtered HTML') {
$filtered = $format->format;
}
else if ($format->name == 'Full HTML') {
elseif ($format->name == 'Full HTML') {
$full = $format->format;
}
}

2
modules/forum/forum.admin.inc
View File

@ -285,7 +285,7 @@ function _forum_parent_select($tid, $title, $child_type) {
if ($child_type == 'container') {
$description = t('Containers are usually placed at the top (root) level, but may also be placed inside another container or forum.');
}
else if ($child_type == 'forum') {
elseif ($child_type == 'forum') {
$description = t('Forums may be placed at the top (root) level, or inside another container or forum.');
}

2
modules/locale/locale.module
View File

@ -562,7 +562,7 @@ function locale_update_js_files() {
}
// If no refresh was attempted, but we have new source files, we need
// to store them too. This occurs if current page is in English.
else if ($new_files) {
elseif ($new_files) {
variable_set('javascript_parsed', $parsed);
}

2
modules/menu/menu.module
View File

@ -272,7 +272,7 @@ function menu_block($op = 'list', $delta = '') {
}
return $blocks;
}
else if ($op == 'view') {
elseif ($op == 'view') {
$data['subject'] = check_plain($menus[$delta]);
$data['content'] = menu_tree($delta);
return $data;

2
modules/node/node.admin.inc
View File

@ -224,7 +224,7 @@ function node_filter_form() {
$value = module_invoke('taxonomy', 'get_term', $value);
$value = $value->name;
}
else if ($type == 'language') {
elseif ($type == 'language') {
$value = empty($value) ? t('Language neutral') : module_invoke('locale', 'language_name', $value);
}
else {

4
modules/node/node.module
View File

@ -718,7 +718,7 @@ function node_invoke_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
if (isset($result) && is_array($result)) {
$return = array_merge($return, $result);
}
else if (isset($result)) {
elseif (isset($result)) {
$return[] = $result;
}
}
@ -1716,7 +1716,7 @@ function node_block($op = 'list', $delta = '') {
$blocks['syndicate']['cache'] = BLOCK_NO_CACHE;
return $blocks;
}
else if ($op == 'view') {
elseif ($op == 'view') {
$block['subject'] = t('Syndicate');
$block['content'] = theme('feed_icon', url('rss.xml'), t('Syndicate'));

2
modules/node/node.pages.inc
View File

@ -356,7 +356,7 @@ function node_preview($node) {
$node->uid = 0; // anonymous user
}
}
else if ($node->uid) {
elseif ($node->uid) {
$user = user_load(array('uid' => $node->uid));
$node->name = $user->name;
$node->picture = $user->picture;

2
modules/openid/openid.module
View File

@ -182,7 +182,7 @@ function openid_begin($claimed_id, $return_to = '', $form_values = array()) {
if (!empty($services[0]['localid'])) {
$identity = $services[0]['localid'];
}
else if (!empty($services[0]['delegate'])) {
elseif (!empty($services[0]['delegate'])) {
$identity = $services[0]['delegate'];
}
else {

2
modules/path/path.module
View File

@ -93,7 +93,7 @@ function path_set_alias($path = NULL, $alias = NULL, $pid = NULL, $language = ''
db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE pid = %d", $path, $alias, $language, $pid);
}
}
else if ($path && $alias) {
elseif ($path && $alias) {
// Check for existing aliases.
if ($alias == drupal_get_path_alias($path, $language)) {
// There is already such an alias, neutral or in this language.

2
modules/poll/poll.module
View File

@ -146,7 +146,7 @@ function poll_block($op = 'list', $delta = '') {
$blocks['recent']['info'] = t('Most recent poll');
return $blocks;
}
else if ($op == 'view') {
elseif ($op == 'view') {
// Retrieve the latest poll.
$sql = db_rewrite_sql("SELECT MAX(n.created) FROM {node} n INNER JOIN {poll} p ON p.nid = n.nid WHERE n.status = 1 AND p.active = 1");
$timestamp = db_result(db_query($sql));

2
modules/profile/profile.admin.inc
View File

@ -254,7 +254,7 @@ Unless you know what you are doing, it is highly recommended that you prefix the
'#description' => t('To enable browsing this field by value, enter a title for the resulting page. The word <code>%value</code> will be substituted with the corresponding value. An example page title is "People whose favorite color is %value" . This is only applicable for a public field.'),
);
}
else if ($type == 'checkbox') {
elseif ($type == 'checkbox') {
$form['fields']['page'] = array('#type' => 'textfield',
'#title' => t('Page title'),
'#default_value' => $edit['page'],

8
modules/profile/profile.module
View File

@ -135,7 +135,7 @@ function profile_block($op = 'list', $delta = '', $edit = array()) {
$blocks['author-information']['cache'] = BLOCK_CACHE_PER_PAGE | BLOCK_CACHE_PER_ROLE;
return $blocks;
}
else if ($op == 'configure') {
elseif ($op == 'configure') {
// Compile a list of fields to show
$fields = array();
$result = db_query('SELECT name, title, weight, visibility FROM {profile_fields} WHERE visibility IN (%d, %d) ORDER BY weight', PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS);
@ -152,10 +152,10 @@ function profile_block($op = 'list', $delta = '', $edit = array()) {
);
return $form;
}
else if ($op == 'save') {
elseif ($op == 'save') {
variable_set('profile_block_author_fields', $edit['profile_block_author_fields']);
}
else if ($op == 'view') {
elseif ($op == 'view') {
if (user_access('access user profiles')) {
$output = '';
if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) {
@ -471,7 +471,7 @@ function profile_validate_profile($edit, $category) {
}
}
}
else if ($field->required && !user_access('administer users')) {
elseif ($field->required && !user_access('administer users')) {
form_set_error($field->name, t('The field %field is required.', array('%field' => $field->title)));
}
}

2
modules/profile/profile.pages.inc
View File

@ -76,7 +76,7 @@ function profile_browse() {
drupal_set_title($title, PASS_THROUGH);
return $output;
}
else if ($name && !$field->fid) {
elseif ($name && !$field->fid) {
drupal_not_found();
}
else {

2
modules/search/search.module
View File

@ -167,7 +167,7 @@ function search_block($op = 'list', $delta = '') {
$blocks['form']['cache'] = BLOCK_NO_CACHE;
return $blocks;
}
else if ($op == 'view' && user_access('search content')) {
elseif ($op == 'view' && user_access('search content')) {
$block['content'] = drupal_get_form('search_block_form');
$block['subject'] = t('Search');
return $block;

6
modules/simpletest/drupal_web_test_case.php
View File

@ -1486,7 +1486,7 @@ class DrupalWebTestCase {
// Input element with correct value.
$found = TRUE;
}
else if (isset($field->option)) {
elseif (isset($field->option)) {
// Select element found.
if ($this->getSelectedItem($field) == $value) {
$found = TRUE;
@ -1499,7 +1499,7 @@ class DrupalWebTestCase {
}
}
}
else if (isset($field[0]) && $field[0] == $value) {
elseif (isset($field[0]) && $field[0] == $value) {
// Text area with correct text.
$found = TRUE;
}
@ -1522,7 +1522,7 @@ class DrupalWebTestCase {
if (isset($item['selected'])) {
return $item['value'];
}
else if ($item->getName() == 'optgroup') {
elseif ($item->getName() == 'optgroup') {
if ($value = $this->getSelectedItem($item)) {
return $value;
}

4
modules/system/system.admin.inc
View File

@ -1147,10 +1147,10 @@ function system_ip_blocking_form_validate($form, &$form_state) {
if (db_result(db_query("SELECT * FROM {blocked_ips} WHERE ip = '%s'", $ip))) {
form_set_error('ip', t('This IP address is already blocked.'));
}
else if ($ip == ip_address()) {
elseif ($ip == ip_address()) {
form_set_error('ip', t('You may not block your own IP address.'));
}
else if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) == FALSE) {
elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) == FALSE) {
form_set_error('ip', t('Please enter a valid IP address.'));
}
}

2
modules/system/system.install
View File

@ -146,7 +146,7 @@ function system_requirements($phase) {
if (REQUEST_TIME - $cron_last > $threshold_error) {
$severity = REQUIREMENT_ERROR;
}
else if ($never_run || (REQUEST_TIME - $cron_last > $threshold_warning)) {
elseif ($never_run || (REQUEST_TIME - $cron_last > $threshold_warning)) {
$severity = REQUIREMENT_WARNING;
}

10
modules/taxonomy/taxonomy.module
View File

@ -227,7 +227,7 @@ function taxonomy_save_vocabulary(&$edit) {
module_invoke_all('taxonomy', 'update', 'vocabulary', $edit);
$status = SAVED_UPDATED;
}
else if (!empty($edit['vid'])) {
elseif (!empty($edit['vid'])) {
$status = taxonomy_del_vocabulary($edit['vid']);
}
else {
@ -328,7 +328,7 @@ function taxonomy_save_term(&$form_values) {
$hook = 'update';
$status = SAVED_UPDATED;
}
else if (!empty($form_values['tid'])) {
elseif (!empty($form_values['tid'])) {
return taxonomy_del_term($form_values['tid']);
}
else {
@ -713,10 +713,10 @@ function taxonomy_node_save($node, $terms) {
}
}
}
else if (is_object($term)) {
elseif (is_object($term)) {
db_query('INSERT INTO {term_node} (nid, vid, tid) VALUES (%d, %d, %d)', $node->nid, $node->vid, $term->tid);
}
else if ($term) {
elseif ($term) {
db_query('INSERT INTO {term_node} (nid, vid, tid) VALUES (%d, %d, %d)', $node->nid, $node->vid, $term);
}
}
@ -1285,7 +1285,7 @@ function taxonomy_terms_parse_string($str_tids) {
// The '+' character in a query string may be parsed as ' '.
$terms['tids'] = preg_split('/[+ ]/', $str_tids);
}
else if (preg_match('/^([0-9]+,)*[0-9]+$/', $str_tids)) {
elseif (preg_match('/^([0-9]+,)*[0-9]+$/', $str_tids)) {
$terms['operator'] = 'and';
$terms['tids'] = explode(',', $str_tids);
}

6
modules/user/user.admin.inc
View File

@ -666,7 +666,7 @@ function user_admin_role_validate($form, &$form_state) {
form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name'])));
}
}
else if ($form_state['values']['op'] == t('Add role')) {
elseif ($form_state['values']['op'] == t('Add role')) {
if (db_result(db_query("SELECT COUNT(*) FROM {role} WHERE name = '%s'", $form_state['values']['name']))) {
form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name'])));
}
@ -682,7 +682,7 @@ function user_admin_role_submit($form, &$form_state) {
db_query("UPDATE {role} SET name = '%s' WHERE rid = %d", $form_state['values']['name'], $form_state['values']['rid']);
drupal_set_message(t('The role has been renamed.'));
}
else if ($form_state['values']['op'] == t('Delete role')) {
elseif ($form_state['values']['op'] == t('Delete role')) {
db_query('DELETE FROM {role} WHERE rid = %d', $form_state['values']['rid']);
db_query('DELETE FROM {role_permission} WHERE rid = %d', $form_state['values']['rid']);
// Update the users who have this role set:
@ -690,7 +690,7 @@ function user_admin_role_submit($form, &$form_state) {
drupal_set_message(t('The role has been deleted.'));
}
else if ($form_state['values']['op'] == t('Add role')) {
elseif ($form_state['values']['op'] == t('Add role')) {
db_query("INSERT INTO {role} (name) VALUES ('%s')", $form_state['values']['name']);
drupal_set_message(t('The role has been added.'));
}

22
modules/user/user.module
View File

@ -162,7 +162,7 @@ function user_load($array = array()) {
$query[] = "$key = %d";
$params[] = $value;
}
else if ($key == 'pass') {
elseif ($key == 'pass') {
$query[] = "pass = '%s'";
$params[] = $value;
}
@ -757,7 +757,7 @@ function user_block($op = 'list', $delta = '', $edit = array()) {
$blocks['online']['cache'] = BLOCK_NO_CACHE;
return $blocks;
}
else if ($op == 'configure' && $delta == 'new') {
elseif ($op == 'configure' && $delta == 'new') {
$form['user_block_whois_new_count'] = array(
'#type' => 'select',
'#title' => t('Number of users to display'),
@ -766,21 +766,21 @@ function user_block($op = 'list', $delta = '', $edit = array()) {
);
return $form;
}
else if ($op == 'configure' && $delta == 'online') {
elseif ($op == 'configure' && $delta == 'online') {
$period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
$form['user_block_seconds_online'] = array('#type' => 'select', '#title' => t('User activity'), '#default_value' => variable_get('user_block_seconds_online', 900), '#options' => $period, '#description' => t('A user is considered online for this long after they have last viewed a page.'));
$form['user_block_max_list_count'] = array('#type' => 'select', '#title' => t('User list length'), '#default_value' => variable_get('user_block_max_list_count', 10), '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online users to display.'));
return $form;
}
else if ($op == 'save' && $delta == 'new') {
elseif ($op == 'save' && $delta == 'new') {
variable_set('user_block_whois_new_count', $edit['user_block_whois_new_count']);
}
else if ($op == 'save' && $delta == 'online') {
elseif ($op == 'save' && $delta == 'online') {
variable_set('user_block_seconds_online', $edit['user_block_seconds_online']);
variable_set('user_block_max_list_count', $edit['user_block_max_list_count']);
}
else if ($op == 'view') {
elseif ($op == 'view') {
$block = array();
switch ($delta) {
@ -871,7 +871,7 @@ function template_preprocess_user_picture(&$variables) {
if (!empty($account->picture) && file_exists($account->picture)) {
$picture = file_create_url($account->picture);
}
else if (variable_get('user_picture_default', '')) {
elseif (variable_get('user_picture_default', '')) {
$picture = variable_get('user_picture_default', '');
}
@ -1551,7 +1551,7 @@ function _user_edit_validate($uid, &$edit) {
if ($error = user_validate_name($edit['name'])) {
form_set_error('name', $error);
}
else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(name) = LOWER('%s')", $uid, $edit['name'])) > 0) {
elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(name) = LOWER('%s')", $uid, $edit['name'])) > 0) {
form_set_error('name', t('The name %name is already taken.', array('%name' => $edit['name'])));
}
}
@ -1560,7 +1560,7 @@ function _user_edit_validate($uid, &$edit) {
if ($error = user_validate_mail($edit['mail'])) {
form_set_error('mail', $error);
}
else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
form_set_error('mail', t('The e-mail address %email is already registered. <a href="@password">Have you forgotten your password?</a>', array('%email' => $edit['mail'], '@password' => url('user/password'))));
}
}
@ -2317,7 +2317,7 @@ function user_register_submit($form, &$form_state) {
if ($admin && !$notify) {
drupal_set_message(t('Created a new user account for <a href="@url">%name</a>. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name)));
}
else if (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) {
elseif (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) {
// No e-mail verification is required, create new user account, and login
// user immediately.
_user_mail_notify('register_no_approval_required', $account);
@ -2327,7 +2327,7 @@ function user_register_submit($form, &$form_state) {
$form_state['redirect'] = '';
return;
}
else if ($account->status || $notify) {
elseif ($account->status || $notify) {
// Create new user account, no administrator approval required.
$op = $notify ? 'register_admin_created' : 'register_no_approval_required';
_user_mail_notify($op, $account);

2
modules/user/user.pages.inc
View File

@ -92,7 +92,7 @@ function user_pass_reset(&$form_state, $uid, $timestamp, $hashed_pass, $action =
drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
drupal_goto('user/password');
}
else if ($account->uid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
elseif ($account->uid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
// First stage is a confirmation form, then login
if ($action == 'login') {
watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));

2
scripts/drupal.sh
View File

@ -118,7 +118,7 @@ while ($param = array_shift($_SERVER['argv'])) {
$_SERVER['PHP_SELF'] = $_SERVER['REQUEST_URI'] = $path['path'];
$cmd = substr($path['path'], 1);
}
else if (isset($path['path'])) {
elseif (isset($path['path'])) {
if (!isset($_GET['q'])) {
$_REQUEST['q'] = $_GET['q'] = $path['path'];
}

4
scripts/run-tests.sh
View File

@ -212,7 +212,7 @@ function simpletest_script_parse_args() {
simpletest_script_print_error("--concurrency must be a strictly positive integer.");
exit;
}
else if ($args['concurrency'] > 1 && !function_exists('pcntl_fork')) {
elseif ($args['concurrency'] > 1 && !function_exists('pcntl_fork')) {
simpletest_script_print_error("Parallel test execution requires the Process Control extension to be compiled in PHP. Please see http://php.net/manual/en/intro.pcntl.php for more information.");
exit;
}
@ -386,7 +386,7 @@ function simpletest_script_get_test_list() {
}
}
}
else if ($args['file']) {
elseif ($args['file']) {
$files = array();
foreach ($args['test_names'] as $file) {
$files[realpath($file)] = 1;

2
update.php
View File

@ -505,7 +505,7 @@ function update_check_incompatibility($name, $type = 'module') {
if ($type == 'module' && isset($modules[$name])) {
$file = $modules[$name];
}
else if ($type == 'theme' && isset($themes[$name])) {
elseif ($type == 'theme' && isset($themes[$name])) {
$file = $themes[$name];
}
if (!isset($file)