From f76acb2d9d421ff705be6fd2713b8cc2c007e1df Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 12 Oct 2008 04:30:09 +0000 Subject: #282405 by Damien Tournoud, lilou, Dave Reid: Enforce coding standard on elseif. --- modules/system/system.admin.inc | 4 ++-- modules/system/system.install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/system') diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index a0394ce74..183a97588 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -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.')); } } diff --git a/modules/system/system.install b/modules/system/system.install index 3a5904dfd..28834f8a3 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -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; } -- cgit v1.2.3