Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.254 diff -u -r1.254 update.php --- update.php 14 Apr 2008 17:48:33 -0000 1.254 +++ update.php 14 Jul 2008 12:39:03 -0000 @@ -459,7 +459,7 @@ 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) Index: includes/cache.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/cache.inc,v retrieving revision 1.20 diff -u -r1.20 cache.inc --- includes/cache.inc 2 Jul 2008 20:42:25 -0000 1.20 +++ includes/cache.inc 14 Jul 2008 12:39:05 -0000 @@ -155,7 +155,7 @@ // This is the first request to clear the cache, start a timer. variable_set('cache_flush', time()); } - else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) { + elseif (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_query("DELETE FROM {" . $table . "} WHERE expire != %d AND expire < %d", CACHE_PERMANENT, time()); Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.776 diff -u -r1.776 common.inc --- includes/common.inc 2 Jul 2008 19:36:52 -0000 1.776 +++ includes/common.inc 14 Jul 2008 12:39:08 -0000 @@ -298,7 +298,7 @@ if (isset($_REQUEST['destination'])) { extract(parse_url(urldecode($_REQUEST['destination']))); } - else if (isset($_REQUEST['edit']['destination'])) { + elseif (isset($_REQUEST['edit']['destination'])) { extract(parse_url(urldecode($_REQUEST['edit']['destination']))); } @@ -1198,25 +1198,25 @@ 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 { @@ -1738,7 +1738,7 @@ } // 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 .= '' . "\n"; } else { @@ -2500,7 +2500,7 @@ 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 Index: includes/file.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/file.inc,v retrieving revision 1.127 diff -u -r1.127 file.inc --- includes/file.inc 5 Jul 2008 18:34:29 -0000 1.127 +++ includes/file.inc 14 Jul 2008 12:39:11 -0000 @@ -109,11 +109,11 @@ return $dest; } // check if the destination is instead inside the Drupal temporary files directory. - else if (file_check_location($dest, file_directory_temp())) { + elseif (file_check_location($dest, file_directory_temp())) { return $dest; } // Not found, try again with prefixed directory path. - else if (file_check_location($file_path . '/' . $dest, $file_path)) { + elseif (file_check_location($file_path . '/' . $dest, $file_path)) { return $file_path . '/' . $dest; } // File not found. Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.275 diff -u -r1.275 form.inc --- includes/form.inc 25 Jun 2008 09:57:07 -0000 1.275 +++ includes/form.inc 14 Jul 2008 12:39:13 -0000 @@ -482,7 +482,7 @@ $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'), @@ -1360,7 +1360,7 @@ 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 { @@ -1464,12 +1464,12 @@ 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; } } Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.176 diff -u -r1.176 locale.inc --- includes/locale.inc 26 May 2008 17:12:54 -0000 1.176 +++ includes/locale.inc 14 Jul 2008 12:39:16 -0000 @@ -1293,7 +1293,7 @@ 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]++; Index: includes/module.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/module.inc,v retrieving revision 1.120 diff -u -r1.120 module.inc --- includes/module.inc 13 May 2008 17:38:42 -0000 1.120 +++ includes/module.inc 14 Jul 2008 12:39:19 -0000 @@ -407,7 +407,7 @@ if ($refresh) { $implementations = array(); } - else if (!defined('MAINTENANCE_MODE') && empty($implementations)) { + elseif (!defined('MAINTENANCE_MODE') && empty($implementations)) { $implementations = registry_get_hook_implementations_cache(); } @@ -474,7 +474,7 @@ if (isset($result) && is_array($result)) { $return = array_merge_recursive($return, $result); } - else if (isset($result)) { + elseif (isset($result)) { $return[] = $result; } } Index: includes/pager.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/pager.inc,v retrieving revision 1.63 diff -u -r1.63 pager.inc --- includes/pager.inc 6 Dec 2007 09:58:30 -0000 1.63 +++ includes/pager.inc 14 Jul 2008 12:39:19 -0000 @@ -401,7 +401,7 @@ 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)); } } Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.430 diff -u -r1.430 theme.inc --- includes/theme.inc 11 Jul 2008 02:23:08 -0000 1.430 +++ includes/theme.inc 14 Jul 2008 12:39:21 -0000 @@ -1125,7 +1125,7 @@ // 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 for adding title and class attributes if (empty($link['html'])) { $link['title'] = check_plain($link['title']); @@ -1454,7 +1454,7 @@ if ($type == MARK_NEW) { return ' ' . t('new') . ''; } - else if ($type == MARK_UPDATED) { + elseif ($type == MARK_UPDATED) { return ' ' . t('updated') . ''; } } @@ -1636,7 +1636,7 @@ $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 Index: includes/unicode.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/unicode.inc,v retrieving revision 1.31 diff -u -r1.31 unicode.inc --- includes/unicode.inc 18 Jun 2008 03:36:23 -0000 1.31 +++ includes/unicode.inc 14 Jul 2008 12:39:22 -0000 @@ -174,10 +174,10 @@ 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 @@ 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 @@ } } } - 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 @@ 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 @@ } $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); Index: modules/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.382 diff -u -r1.382 aggregator.module --- modules/aggregator/aggregator.module 5 Jul 2008 05:57:00 -0000 1.382 +++ modules/aggregator/aggregator.module 14 Jul 2008 12:39:25 -0000 @@ -776,7 +776,7 @@ if (!empty($guid)) { $entry = db_fetch_object(db_query("SELECT iid 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 FROM {aggregator_item} WHERE fid = %d AND link = '%s'", $feed['fid'], $link)); } else { Index: modules/blog/blog.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v retrieving revision 1.10 diff -u -r1.10 blog.pages.inc --- modules/blog/blog.pages.inc 22 May 2008 19:27:13 -0000 1.10 +++ modules/blog/blog.pages.inc 14 Jul 2008 12:39:27 -0000 @@ -19,7 +19,7 @@ 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.'); } Index: modules/comment/comment.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.pages.inc,v retrieving revision 1.6 diff -u -r1.6 comment.pages.inc --- modules/comment/comment.pages.inc 24 Jun 2008 17:01:33 -0000 1.6 +++ modules/comment/comment.pages.inc 14 Jul 2008 12:39:32 -0000 @@ -88,7 +88,7 @@ } } // 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 @@ 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 { Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.10 diff -u -r1.10 contact.pages.inc --- modules/contact/contact.pages.inc 19 Apr 2008 14:44:34 -0000 1.10 +++ modules/contact/contact.pages.inc 14 Jul 2008 12:39:33 -0000 @@ -160,7 +160,7 @@ if (!valid_email_address($user->mail)) { $output = t('You need to provide a valid e-mail address to contact other users. Please update your user information 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 { Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.214 diff -u -r1.214 filter.module --- modules/filter/filter.module 10 Jul 2008 01:52:42 -0000 1.214 +++ modules/filter/filter.module 14 Jul 2008 12:39:35 -0000 @@ -877,12 +877,12 @@ } } // 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('|
\s*
|', "\n\n", $chunk); $chunk = preg_replace('!(<' . $block . '[^>]*>)!', "\n$1", $chunk); // Space things out a little @@ -1000,7 +1000,7 @@ // We matched a lone ">" character return '>'; } - else if (strlen($string) == 1) { + elseif (strlen($string) == 1) { // We matched a lone "<" character return '<'; } Index: modules/filter/filter.test =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v retrieving revision 1.5 diff -u -r1.5 filter.test --- modules/filter/filter.test 6 Jun 2008 10:36:43 -0000 1.5 +++ modules/filter/filter.test 14 Jul 2008 12:39:36 -0000 @@ -162,7 +162,7 @@ if ($format->name == 'Filtered HTML') { $filtered = $format->format; } - else if ($format->name == 'Full HTML') { + elseif ($format->name == 'Full HTML') { $full = $format->format; } } Index: modules/forum/forum.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v retrieving revision 1.11 diff -u -r1.11 forum.admin.inc --- modules/forum/forum.admin.inc 30 May 2008 18:17:35 -0000 1.11 +++ modules/forum/forum.admin.inc 14 Jul 2008 12:39:36 -0000 @@ -285,7 +285,7 @@ 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.'); } Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.219 diff -u -r1.219 locale.module --- modules/locale/locale.module 10 Jul 2008 01:45:47 -0000 1.219 +++ modules/locale/locale.module 14 Jul 2008 12:39:39 -0000 @@ -548,7 +548,7 @@ } // 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); } Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.165 diff -u -r1.165 menu.module --- modules/menu/menu.module 25 Jun 2008 09:12:25 -0000 1.165 +++ modules/menu/menu.module 14 Jul 2008 12:39:40 -0000 @@ -269,7 +269,7 @@ } return $blocks; } - else if ($op == 'view') { + elseif ($op == 'view') { $data['subject'] = check_plain($menus[$delta]); $data['content'] = menu_tree($delta); return $data; Index: modules/node/node.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v retrieving revision 1.22 diff -u -r1.22 node.admin.inc --- modules/node/node.admin.inc 14 Apr 2008 17:48:38 -0000 1.22 +++ modules/node/node.admin.inc 14 Jul 2008 12:39:41 -0000 @@ -229,7 +229,7 @@ $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 { Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.967 diff -u -r1.967 node.module --- modules/node/node.module 26 May 2008 17:12:55 -0000 1.967 +++ modules/node/node.module 14 Jul 2008 12:39:43 -0000 @@ -704,7 +704,7 @@ if (isset($result) && is_array($result)) { $return = array_merge($return, $result); } - else if (isset($result)) { + elseif (isset($result)) { $return[] = $result; } } @@ -1679,7 +1679,7 @@ $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')); Index: modules/node/node.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v retrieving revision 1.31 diff -u -r1.31 node.pages.inc --- modules/node/node.pages.inc 10 Jul 2008 11:12:02 -0000 1.31 +++ modules/node/node.pages.inc 14 Jul 2008 12:39:44 -0000 @@ -373,7 +373,7 @@ $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; Index: modules/openid/openid.module =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v retrieving revision 1.25 diff -u -r1.25 openid.module --- modules/openid/openid.module 6 May 2008 12:18:48 -0000 1.25 +++ modules/openid/openid.module 14 Jul 2008 12:39:45 -0000 @@ -182,7 +182,7 @@ 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 { Index: modules/path/path.module =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.module,v retrieving revision 1.144 diff -u -r1.144 path.module --- modules/path/path.module 21 Jun 2008 18:22:38 -0000 1.144 +++ modules/path/path.module 14 Jul 2008 12:39:46 -0000 @@ -93,7 +93,7 @@ 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. Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.268 diff -u -r1.268 poll.module --- modules/poll/poll.module 15 May 2008 20:55:58 -0000 1.268 +++ modules/poll/poll.module 14 Jul 2008 12:39:47 -0000 @@ -137,7 +137,7 @@ $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)); Index: modules/profile/profile.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v retrieving revision 1.10 diff -u -r1.10 profile.admin.inc --- modules/profile/profile.admin.inc 14 Apr 2008 17:48:41 -0000 1.10 +++ modules/profile/profile.admin.inc 14 Jul 2008 12:39:47 -0000 @@ -254,7 +254,7 @@ '#description' => t('To enable browsing this field by value, enter a title for the resulting page. The word %value 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'], Index: modules/profile/profile.module =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v retrieving revision 1.241 diff -u -r1.241 profile.module --- modules/profile/profile.module 6 May 2008 12:18:49 -0000 1.241 +++ modules/profile/profile.module 14 Jul 2008 12:39:48 -0000 @@ -135,7 +135,7 @@ $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 @@ ); 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)) { @@ -434,7 +434,7 @@ } } } - 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))); } } Index: modules/profile/profile.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v retrieving revision 1.2 diff -u -r1.2 profile.pages.inc --- modules/profile/profile.pages.inc 8 Dec 2007 14:06:22 -0000 1.2 +++ modules/profile/profile.pages.inc 14 Jul 2008 12:39:48 -0000 @@ -76,7 +76,7 @@ drupal_set_title($title); return $output; } - else if ($name && !$field->fid) { + elseif ($name && !$field->fid) { drupal_not_found(); } else { Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.259 diff -u -r1.259 search.module --- modules/search/search.module 10 Jul 2008 02:13:02 -0000 1.259 +++ modules/search/search.module 14 Jul 2008 12:39:50 -0000 @@ -158,7 +158,7 @@ $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; Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.78 diff -u -r1.78 system.admin.inc --- modules/system/system.admin.inc 1 Jul 2008 20:36:40 -0000 1.78 +++ modules/system/system.admin.inc 14 Jul 2008 12:39:56 -0000 @@ -1141,10 +1141,10 @@ 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.')); } } Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.256 diff -u -r1.256 system.install --- modules/system/system.install 1 Jul 2008 20:36:40 -0000 1.256 +++ modules/system/system.install 14 Jul 2008 12:39:58 -0000 @@ -146,7 +146,7 @@ if (time() - $cron_last > $threshold_error) { $severity = REQUIREMENT_ERROR; } - else if ($never_run || (time() - $cron_last > $threshold_warning)) { + elseif ($never_run || (time() - $cron_last > $threshold_warning)) { $severity = REQUIREMENT_WARNING; } Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.423 diff -u -r1.423 taxonomy.module --- modules/taxonomy/taxonomy.module 28 Jun 2008 19:51:02 -0000 1.423 +++ modules/taxonomy/taxonomy.module 14 Jul 2008 12:40:02 -0000 @@ -205,7 +205,7 @@ 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 { @@ -306,7 +306,7 @@ $hook = 'update'; $status = SAVED_UPDATED; } - else if (!empty($form_values['tid'])) { + elseif (!empty($form_values['tid'])) { return taxonomy_del_term($form_values['tid']); } else { @@ -691,10 +691,10 @@ } } } - 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); } } @@ -1208,7 +1208,7 @@ // 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); } Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.22 diff -u -r1.22 user.admin.inc --- modules/user/user.admin.inc 7 May 2008 19:34:24 -0000 1.22 +++ modules/user/user.admin.inc 14 Jul 2008 12:40:08 -0000 @@ -672,7 +672,7 @@ 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']))); } @@ -688,7 +688,7 @@ 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: @@ -696,7 +696,7 @@ 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.')); } Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.911 diff -u -r1.911 user.module --- modules/user/user.module 27 Jun 2008 07:25:11 -0000 1.911 +++ modules/user/user.module 14 Jul 2008 12:40:10 -0000 @@ -162,7 +162,7 @@ $query[] = "$key = %d"; $params[] = $value; } - else if ($key == 'pass') { + elseif ($key == 'pass') { $query[] = "pass = '%s'"; $params[] = $value; } @@ -728,7 +728,7 @@ $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'), @@ -737,21 +737,21 @@ ); 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) { @@ -842,7 +842,7 @@ 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', ''); } @@ -1514,7 +1514,7 @@ 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']))); } } @@ -1523,7 +1523,7 @@ 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. Have you forgotten your password?', array('%email' => $edit['mail'], '@password' => url('user/password')))); } } @@ -2280,7 +2280,7 @@ if ($admin && !$notify) { drupal_set_message(t('Created a new user account for %name. 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); @@ -2290,7 +2290,7 @@ $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); Index: modules/user/user.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v retrieving revision 1.13 diff -u -r1.13 user.pages.inc --- modules/user/user.pages.inc 14 Apr 2008 17:48:43 -0000 1.13 +++ modules/user/user.pages.inc 14 Jul 2008 12:40:10 -0000 @@ -92,7 +92,7 @@ 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)); Index: scripts/drupal.sh =================================================================== RCS file: /cvs/drupal/drupal/scripts/drupal.sh,v retrieving revision 1.5 diff -u -r1.5 drupal.sh --- scripts/drupal.sh 17 Feb 2008 20:09:52 -0000 1.5 +++ scripts/drupal.sh 14 Jul 2008 12:40:11 -0000 @@ -118,7 +118,7 @@ $_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']; }