!htaccess", $variables, WATCHDOG_ERROR);
+ watchdog('security', "Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: !htaccess", $variables, LOG_ERR);
}
}
@@ -896,7 +896,7 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
file_ensure_htaccess();
// Perform the copy operation.
if (!@copy($source, $destination)) {
- watchdog('file', 'The specified file %file could not be copied to %destination.', array('%file' => $source, '%destination' => drupal_realpath($destination)), WATCHDOG_ERROR);
+ watchdog('file', 'The specified file %file could not be copied to %destination.', array('%file' => $source, '%destination' => drupal_realpath($destination)), LOG_ERR);
return FALSE;
}
@@ -1261,7 +1261,7 @@ function file_unmanaged_delete($path) {
// Resolve streamwrapper URI to local path.
$path = drupal_realpath($path);
if (is_dir($path)) {
- watchdog('file', '%path is a directory and cannot be removed using file_unmanaged_delete().', array('%path' => $path), WATCHDOG_ERROR);
+ watchdog('file', '%path is a directory and cannot be removed using file_unmanaged_delete().', array('%path' => $path), LOG_ERR);
return FALSE;
}
if (is_file($path)) {
@@ -1270,12 +1270,12 @@ function file_unmanaged_delete($path) {
// Return TRUE for non-existent file, but log that nothing was actually
// deleted, as the current state is the intended result.
if (!file_exists($path)) {
- watchdog('file', 'The file %path was not deleted, because it does not exist.', array('%path' => $path), WATCHDOG_NOTICE);
+ watchdog('file', 'The file %path was not deleted, because it does not exist.', array('%path' => $path), LOG_NOTICE);
return TRUE;
}
// We cannot handle anything other than files and directories. Log an error
// for everything else (sockets, symbolic links, etc).
- watchdog('file', 'The file %path is not of a recognized type so it was not deleted.', array('%path' => $path), WATCHDOG_ERROR);
+ watchdog('file', 'The file %path is not of a recognized type so it was not deleted.', array('%path' => $path), LOG_ERR);
return FALSE;
}
@@ -2104,7 +2104,7 @@ function drupal_chmod($uri, $mode = NULL) {
}
}
- watchdog('file', 'The file permissions could not be set on %uri.', array('%uri' => $uri), WATCHDOG_ERROR);
+ watchdog('file', 'The file permissions could not be set on %uri.', array('%uri' => $uri), LOG_ERR);
return FALSE;
}
diff --git a/includes/form.inc b/includes/form.inc
index 3f83b8e3db4..4f678023def 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1244,7 +1244,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) {
foreach ($value as $v) {
if (!isset($options[$v])) {
form_error($elements, $t('An illegal choice has been detected. Please contact the site administrator.'));
- watchdog('form', 'Illegal choice %choice in !name element.', array('%choice' => $v, '!name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), WATCHDOG_ERROR);
+ watchdog('form', 'Illegal choice %choice in !name element.', array('%choice' => $v, '!name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), LOG_ERR);
}
}
}
@@ -1263,7 +1263,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) {
}
elseif (!isset($options[$elements['#value']])) {
form_error($elements, $t('An illegal choice has been detected. Please contact the site administrator.'));
- watchdog('form', 'Illegal choice %choice in %name element.', array('%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), WATCHDOG_ERROR);
+ watchdog('form', 'Illegal choice %choice in %name element.', array('%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), LOG_ERR);
}
}
}
diff --git a/includes/image.inc b/includes/image.inc
index b04943b5e61..9f8cd559331 100644
--- a/includes/image.inc
+++ b/includes/image.inc
@@ -96,7 +96,7 @@ function image_toolkit_invoke($method, stdClass $image, array $params = array())
array_unshift($params, $image);
return call_user_func_array($function, $params);
}
- watchdog('image', 'The selected image handling toolkit %toolkit can not correctly process %function.', array('%toolkit' => $image->toolkit, '%function' => $function), WATCHDOG_ERROR);
+ watchdog('image', 'The selected image handling toolkit %toolkit can not correctly process %function.', array('%toolkit' => $image->toolkit, '%function' => $function), LOG_ERR);
return FALSE;
}
diff --git a/includes/install.inc b/includes/install.inc
index 75ff62360d0..2f6be29b497 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -791,7 +791,7 @@ function drupal_uninstall_modules($module_list = array(), $uninstall_dependents
module_invoke($module, 'uninstall');
drupal_uninstall_schema($module);
- watchdog('system', '%module module uninstalled.', array('%module' => $module), WATCHDOG_INFO);
+ watchdog('system', '%module module uninstalled.', array('%module' => $module), LOG_INFO);
// Now remove the menu links for all paths declared by this module.
if (!empty($paths)) {
diff --git a/includes/locale.inc b/includes/locale.inc
index 578b1b3c643..0ca9944f51b 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -562,7 +562,7 @@ function _locale_import_po($file, $langcode, $mode, $group = NULL) {
if ($skips) {
$skip_message = format_plural($skips, 'One translation string was skipped because it contains disallowed HTML.', '@count translation strings were skipped because they contain disallowed HTML.');
drupal_set_message($skip_message);
- watchdog('locale', '@count disallowed HTML string(s) in %file', array('@count' => $skips, '%file' => $file->uri), WATCHDOG_WARNING);
+ watchdog('locale', '@count disallowed HTML string(s) in %file', array('@count' => $skips, '%file' => $file->uri), LOG_WARNING);
}
return TRUE;
}
@@ -1956,7 +1956,7 @@ function _locale_rebuild_js($langcode = NULL) {
watchdog('locale', 'Updated JavaScript translation file for the language %language.', array('%language' => t($language->name)));
return TRUE;
case 'rebuilt':
- watchdog('locale', 'JavaScript translation file %file.js was lost.', array('%file' => $language->javascript), WATCHDOG_WARNING);
+ watchdog('locale', 'JavaScript translation file %file.js was lost.', array('%file' => $language->javascript), LOG_WARNING);
// Proceed to the 'created' case as the JavaScript translation file has
// been created again.
case 'created':
@@ -1966,7 +1966,7 @@ function _locale_rebuild_js($langcode = NULL) {
watchdog('locale', 'Removed JavaScript translation file for the language %language, because no translations currently exist for that language.', array('%language' => t($language->name)));
return TRUE;
case 'error':
- watchdog('locale', 'An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => t($language->name)), WATCHDOG_ERROR);
+ watchdog('locale', 'An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => t($language->name)), LOG_ERR);
return FALSE;
default:
// No operation needed.
diff --git a/includes/mail.inc b/includes/mail.inc
index d2febed3968..be2df923427 100644
--- a/includes/mail.inc
+++ b/includes/mail.inc
@@ -152,7 +152,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N
// Log errors
if (!$message['result']) {
- watchdog('mail', 'Error sending e-mail (from %from to %to).', array('%from' => $message['from'], '%to' => $message['to']), WATCHDOG_ERROR);
+ watchdog('mail', 'Error sending e-mail (from %from to %to).', array('%from' => $message['from'], '%to' => $message['to']), LOG_ERR);
drupal_set_message(t('Unable to send e-mail. Contact the site administrator if the problem persists.'), 'error');
}
}
diff --git a/includes/module.inc b/includes/module.inc
index 08749f33c7e..7f7685fcb08 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -448,7 +448,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
module_invoke($module, 'install');
// Record the fact that it was installed.
$modules_installed[] = $module;
- watchdog('system', '%module module installed.', array('%module' => $module), WATCHDOG_INFO);
+ watchdog('system', '%module module installed.', array('%module' => $module), LOG_INFO);
}
// Enable the module.
@@ -456,7 +456,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
// Record the fact that it was enabled.
$modules_enabled[] = $module;
- watchdog('system', '%module module enabled.', array('%module' => $module), WATCHDOG_INFO);
+ watchdog('system', '%module module enabled.', array('%module' => $module), LOG_INFO);
}
}
@@ -530,7 +530,7 @@ function module_disable($module_list, $disable_dependents = TRUE) {
->condition('name', $module)
->execute();
$invoke_modules[] = $module;
- watchdog('system', '%module module disabled.', array('%module' => $module), WATCHDOG_INFO);
+ watchdog('system', '%module module disabled.', array('%module' => $module), LOG_INFO);
}
}
diff --git a/includes/theme.inc b/includes/theme.inc
index 9bd706209a9..67cbe85cfc4 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -789,7 +789,7 @@ function theme($hook, $variables = array()) {
// Only log a message when not trying theme suggestions ($hook being an
// array).
if (!isset($candidate)) {
- watchdog('theme', 'Theme key "@key" not found.', array('@key' => $hook), WATCHDOG_WARNING);
+ watchdog('theme', 'Theme key "@key" not found.', array('@key' => $hook), LOG_WARNING);
}
return '';
}
diff --git a/includes/unicode.inc b/includes/unicode.inc
index 81ba00a13bf..7487d7f5039 100644
--- a/includes/unicode.inc
+++ b/includes/unicode.inc
@@ -202,7 +202,7 @@ function drupal_xml_parser_create(&$data) {
$data = preg_replace('/^(<\?xml[^>]+encoding)="(.+?)"/', '\\1="utf-8"', $out);
}
else {
- watchdog('php', 'Could not convert XML encoding %s to UTF-8.', array('%s' => $encoding), WATCHDOG_WARNING);
+ watchdog('php', 'Could not convert XML encoding %s to UTF-8.', array('%s' => $encoding), LOG_WARNING);
return FALSE;
}
}
@@ -236,7 +236,7 @@ function drupal_convert_to_utf8($data, $encoding) {
$out = @recode_string($encoding . '..utf-8', $data);
}
else {
- watchdog('php', 'Unsupported encoding %s. Please install iconv, GNU recode or mbstring for PHP.', array('%s' => $encoding), WATCHDOG_ERROR);
+ watchdog('php', 'Unsupported encoding %s. Please install iconv, GNU recode or mbstring for PHP.', array('%s' => $encoding), LOG_ERR);
return FALSE;
}
diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc
index 08087afb2b8..d9039e08ae0 100644
--- a/modules/aggregator/aggregator.admin.inc
+++ b/modules/aggregator/aggregator.admin.inc
@@ -193,7 +193,7 @@ function aggregator_form_feed_submit($form, &$form_state) {
}
}
else {
- watchdog('aggregator', 'Feed %feed added.', array('%feed' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/config/services/aggregator'));
+ watchdog('aggregator', 'Feed %feed added.', array('%feed' => $form_state['values']['title']), LOG_NOTICE, l(t('view'), 'admin/config/services/aggregator'));
drupal_set_message(t('The feed %feed has been added.', array('%feed' => $form_state['values']['title'])));
}
}
@@ -591,7 +591,7 @@ function aggregator_form_category_submit($form, &$form_state) {
}
}
else {
- watchdog('aggregator', 'Category %category added.', array('%category' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/config/services/aggregator'));
+ watchdog('aggregator', 'Category %category added.', array('%category' => $form_state['values']['title']), LOG_NOTICE, l(t('view'), 'admin/config/services/aggregator'));
drupal_set_message(t('The category %category has been added.', array('%category' => $form_state['values']['title'])));
}
}
diff --git a/modules/aggregator/aggregator.fetcher.inc b/modules/aggregator/aggregator.fetcher.inc
index 0f728779864..9f15177e808 100644
--- a/modules/aggregator/aggregator.fetcher.inc
+++ b/modules/aggregator/aggregator.fetcher.inc
@@ -53,7 +53,7 @@ function aggregator_aggregator_fetch($feed) {
$feed->http_headers = $result->headers;
break;
default:
- watchdog('aggregator', 'The feed from %site seems to be broken, due to "%error".', array('%site' => $feed->title, '%error' => $result->code . ' ' . $result->error), WATCHDOG_WARNING);
+ watchdog('aggregator', 'The feed from %site seems to be broken, due to "%error".', array('%site' => $feed->title, '%error' => $result->code . ' ' . $result->error), LOG_WARNING);
drupal_set_message(t('The feed from %site seems to be broken, because of error "%error".', array('%site' => $feed->title, '%error' => $result->code . ' ' . $result->error)));
}
diff --git a/modules/aggregator/aggregator.parser.inc b/modules/aggregator/aggregator.parser.inc
index cffd1c3aa49..d9b3108f4b0 100644
--- a/modules/aggregator/aggregator.parser.inc
+++ b/modules/aggregator/aggregator.parser.inc
@@ -85,7 +85,7 @@ function aggregator_parse_feed(&$data, $feed) {
xml_set_character_data_handler($xml_parser, 'aggregator_element_data');
if (!xml_parse($xml_parser, $data, 1)) {
- watchdog('aggregator', 'The feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => $feed->title, '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser)), WATCHDOG_WARNING);
+ watchdog('aggregator', 'The feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => $feed->title, '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser)), LOG_WARNING);
drupal_set_message(t('The feed from %site seems to be broken, because of error "%error" on line %line.', array('%site' => $feed->title, '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error');
return FALSE;
}
diff --git a/modules/book/book.admin.inc b/modules/book/book.admin.inc
index 7b9dea390f5..58fd4f9dc5d 100644
--- a/modules/book/book.admin.inc
+++ b/modules/book/book.admin.inc
@@ -130,7 +130,7 @@ function book_admin_edit_submit($form, &$form_state) {
$node->log = t('Title changed from %original to %current.', array('%original' => $node->title, '%current' => $values['title']));
node_save($node);
- watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/' . $node->nid));
+ watchdog('content', 'book: updated %title.', array('%title' => $node->title), LOG_NOTICE, l(t('view'), 'node/' . $node->nid));
}
}
}
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index f8c3a011ed0..55c6fcbb0e2 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -2223,7 +2223,7 @@ function comment_form_submit($form, &$form_state) {
$form_state['values']['cid'] = $comment->cid;
// Add an entry to the watchdog log.
- watchdog('content', 'Comment posted: %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)));
+ watchdog('content', 'Comment posted: %subject.', array('%subject' => $comment->subject), LOG_NOTICE, l(t('view'), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)));
// Explain the approval queue if necessary.
if ($comment->status == COMMENT_NOT_PUBLISHED) {
@@ -2244,7 +2244,7 @@ function comment_form_submit($form, &$form_state) {
$redirect = array('node/' . $node->nid, array('query' => $query, 'fragment' => 'comment-' . $comment->cid));
}
else {
- watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->subject), WATCHDOG_WARNING);
+ watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->subject), LOG_WARNING);
drupal_set_message(t('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->subject)), 'error');
// Redirect the user to the node they are commenting on.
$redirect = 'node/' . $node->nid;
diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc
index 9fde037d345..bc555c487d6 100644
--- a/modules/contact/contact.admin.inc
+++ b/modules/contact/contact.admin.inc
@@ -162,7 +162,7 @@ function contact_category_edit_form_submit($form, &$form_state) {
}
drupal_set_message(t('Category %category has been saved.', array('%category' => $form_state['values']['category'])));
- watchdog('contact', 'Category %category has been saved.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('Edit'), 'admin/structure/contact/edit/' . $form_state['values']['cid']));
+ watchdog('contact', 'Category %category has been saved.', array('%category' => $form_state['values']['category']), LOG_NOTICE, l(t('Edit'), 'admin/structure/contact/edit/' . $form_state['values']['cid']));
$form_state['redirect'] = 'admin/structure/contact';
}
@@ -200,7 +200,7 @@ function contact_category_delete_form_submit($form, &$form_state) {
->execute();
drupal_set_message(t('Category %category has been deleted.', array('%category' => $contact['category'])));
- watchdog('contact', 'Category %category has been deleted.', array('%category' => $contact['category']), WATCHDOG_NOTICE);
+ watchdog('contact', 'Category %category has been deleted.', array('%category' => $contact['category']), LOG_NOTICE);
$form_state['redirect'] = 'admin/structure/contact';
}
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index 947100daa6c..ef8f93506a0 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -15,14 +15,14 @@ function dblog_overview() {
$filter = dblog_build_filter_query();
$rows = array();
$classes = array(
- WATCHDOG_DEBUG => 'dblog-debug',
- WATCHDOG_INFO => 'dblog-info',
- WATCHDOG_NOTICE => 'dblog-notice',
- WATCHDOG_WARNING => 'dblog-warning',
- WATCHDOG_ERROR => 'dblog-error',
- WATCHDOG_CRITICAL => 'dblog-critical',
- WATCHDOG_ALERT => 'dblog-alert',
- WATCHDOG_EMERGENCY => 'dblog-emerg',
+ LOG_DEBUG => 'dblog-debug',
+ LOG_INFO => 'dblog-info',
+ LOG_NOTICE => 'dblog-notice',
+ LOG_WARNING => 'dblog-warning',
+ LOG_ERR => 'dblog-error',
+ LOG_CRIT => 'dblog-critical',
+ LOG_ALERT => 'dblog-alert',
+ LOG_EMERG => 'dblog-emerg',
);
$build['dblog_filter_form'] = drupal_get_form('dblog_filter_form');
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index 5717455ef8f..d2781ebb136 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -94,7 +94,7 @@ class DBLogTestCase extends DrupalWebTestCase {
* @param $severity
* The severity of the watchdog entry.
*/
- private function generateLogEntries($count, $type = 'custom', $severity = WATCHDOG_NOTICE) {
+ private function generateLogEntries($count, $type = 'custom', $severity = LOG_NOTICE) {
global $base_root;
// Prepare the fields to be logged
@@ -384,7 +384,7 @@ class DBLogTestCase extends DrupalWebTestCase {
'type' => 'custom',
'message' => 'Log entry added to test the doClearTest clear down.',
'variables' => array(),
- 'severity' => WATCHDOG_NOTICE,
+ 'severity' => LOG_NOTICE,
'link' => NULL,
'user' => $this->big_user,
'request_uri' => $base_root . request_uri(),
@@ -419,7 +419,7 @@ class DBLogTestCase extends DrupalWebTestCase {
$types = array();
for ($i = 0; $i < 3; $i++) {
$type_names[] = $type_name = $this->randomName();
- $severity = WATCHDOG_EMERGENCY;
+ $severity = LOG_EMERG;
for ($j = 0; $j < 3; $j++) {
$types[] = $type = array(
'count' => mt_rand(1, 5),
@@ -532,14 +532,14 @@ class DBLogTestCase extends DrupalWebTestCase {
protected function getSeverityConstant($class) {
// Reversed array from dblog_overview().
$map = array(
- 'dblog-debug' => WATCHDOG_DEBUG,
- 'dblog-info' => WATCHDOG_INFO,
- 'dblog-notice' => WATCHDOG_NOTICE,
- 'dblog-warning' => WATCHDOG_WARNING,
- 'dblog-error' => WATCHDOG_ERROR,
- 'dblog-critical' => WATCHDOG_CRITICAL,
- 'dblog-alert' => WATCHDOG_ALERT,
- 'dblog-emerg' => WATCHDOG_EMERGENCY,
+ 'dblog-debug' => LOG_DEBUG,
+ 'dblog-info' => LOG_INFO,
+ 'dblog-notice' => LOG_NOTICE,
+ 'dblog-warning' => LOG_WARNING,
+ 'dblog-error' => LOG_ERR,
+ 'dblog-critical' => LOG_CRIT,
+ 'dblog-alert' => LOG_ALERT,
+ 'dblog-emerg' => LOG_EMERG,
);
// Find the class that contains the severity.
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 66fadcba74f..773fa80be74 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -721,7 +721,7 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE)
}
// If the requested text format does not exist, the text cannot be filtered.
if (!$format = filter_format_load($format_id)) {
- watchdog('filter', 'Missing text format: %format.', array('%format' => $format_id), WATCHDOG_ALERT);
+ watchdog('filter', 'Missing text format: %format.', array('%format' => $format_id), LOG_ALERT);
return '';
}
diff --git a/modules/image/image.effects.inc b/modules/image/image.effects.inc
index 122af6c44f1..6120f9cdc7b 100644
--- a/modules/image/image.effects.inc
+++ b/modules/image/image.effects.inc
@@ -73,7 +73,7 @@ function image_image_effect_info() {
*/
function image_resize_effect(&$image, $data) {
if (!image_resize($image, $data['width'], $data['height'])) {
- watchdog('image', 'Image resize failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
+ watchdog('image', 'Image resize failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), LOG_ERR);
return FALSE;
}
return TRUE;
@@ -108,7 +108,7 @@ function image_scale_effect(&$image, $data) {
$data['height'] = empty($data['height']) ? PHP_INT_MAX : $data['height'];
if (!image_scale($image, $data['width'], $data['height'], $data['upscale'])) {
- watchdog('image', 'Image scale failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
+ watchdog('image', 'Image scale failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), LOG_ERR);
return FALSE;
}
return TRUE;
@@ -142,7 +142,7 @@ function image_crop_effect(&$image, $data) {
$x = image_filter_keyword($x, $image->info['width'], $data['width']);
$y = image_filter_keyword($y, $image->info['height'], $data['height']);
if (!image_crop($image, $x, $y, $data['width'], $data['height'])) {
- watchdog('image', 'Image crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
+ watchdog('image', 'Image crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), LOG_ERR);
return FALSE;
}
return TRUE;
@@ -164,7 +164,7 @@ function image_crop_effect(&$image, $data) {
*/
function image_scale_and_crop_effect(&$image, $data) {
if (!image_scale_and_crop($image, $data['width'], $data['height'])) {
- watchdog('image', 'Image scale and crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
+ watchdog('image', 'Image scale and crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), LOG_ERR);
return FALSE;
}
return TRUE;
@@ -183,7 +183,7 @@ function image_scale_and_crop_effect(&$image, $data) {
*/
function image_desaturate_effect(&$image, $data) {
if (!image_desaturate($image)) {
- watchdog('image', 'Image desaturate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
+ watchdog('image', 'Image desaturate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), LOG_ERR);
return FALSE;
}
return TRUE;
@@ -236,7 +236,7 @@ function image_rotate_effect(&$image, $data) {
}
if (!image_rotate($image, $data['degrees'], $data['bgcolor'])) {
- watchdog('image', 'Image rotate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
+ watchdog('image', 'Image rotate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), LOG_ERR);
return FALSE;
}
return TRUE;
diff --git a/modules/image/image.module b/modules/image/image.module
index d2d081c3ec2..5caf282cf2e 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -737,7 +737,7 @@ function image_style_create_derivative($style, $source, $destination) {
// Build the destination folder tree if it doesn't already exist.
if (!file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS)) {
- watchdog('image', 'Failed to create style directory: %directory', array('%directory' => $directory), WATCHDOG_ERROR);
+ watchdog('image', 'Failed to create style directory: %directory', array('%directory' => $directory), LOG_ERR);
return FALSE;
}
@@ -751,7 +751,7 @@ function image_style_create_derivative($style, $source, $destination) {
if (!image_save($image, $destination)) {
if (file_exists($destination)) {
- watchdog('image', 'Cached image file %destination already exists. There may be an issue with your rewrite configuration.', array('%destination' => $destination), WATCHDOG_ERROR);
+ watchdog('image', 'Cached image file %destination already exists. There may be an issue with your rewrite configuration.', array('%destination' => $destination), LOG_ERR);
}
return FALSE;
}
diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc
index de16133fb5a..3263f1058f9 100644
--- a/modules/locale/locale.admin.inc
+++ b/modules/locale/locale.admin.inc
@@ -1002,7 +1002,7 @@ function locale_translate_import_form_submit($form, &$form_state) {
if ($return = _locale_import_po($file, $langcode, $form_state['values']['mode'], $form_state['values']['group']) == FALSE) {
$variables = array('%filename' => $file->filename);
drupal_set_message(t('The translation import of %filename failed.', $variables), 'error');
- watchdog('locale', 'The translation import of %filename failed.', $variables, WATCHDOG_ERROR);
+ watchdog('locale', 'The translation import of %filename failed.', $variables, LOG_ERR);
}
}
else {
@@ -1181,7 +1181,7 @@ function locale_translate_edit_form_validate($form, &$form_state) {
foreach ($form_state['values']['translations'] as $key => $value) {
if ($safe_check_needed && !locale_string_is_safe($value)) {
form_set_error('translations', t('The submitted string contains disallowed HTML: %string', array('%string' => $value)));
- watchdog('locale', 'Attempted submission of a translation string with disallowed HTML: %string', array('%string' => $value), WATCHDOG_WARNING);
+ watchdog('locale', 'Attempted submission of a translation string with disallowed HTML: %string', array('%string' => $value), LOG_WARNING);
}
}
}
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 1f3c4f728f3..de74d8cf7a9 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -545,7 +545,7 @@ function menu_delete_menu_confirm_submit($form, &$form_state) {
$t_args = array('%title' => $menu['title']);
drupal_set_message(t('The custom menu %title has been deleted.', $t_args));
- watchdog('menu', 'Deleted custom menu %title and all its menu links.', $t_args, WATCHDOG_NOTICE);
+ watchdog('menu', 'Deleted custom menu %title and all its menu links.', $t_args, LOG_NOTICE);
}
/**
@@ -627,7 +627,7 @@ function menu_item_delete_form_submit($form, &$form_state) {
menu_link_delete($item['mlid']);
$t_args = array('%title' => $item['link_title']);
drupal_set_message(t('The menu link %title has been deleted.', $t_args));
- watchdog('menu', 'Deleted menu link %title.', $t_args, WATCHDOG_NOTICE);
+ watchdog('menu', 'Deleted menu link %title.', $t_args, LOG_NOTICE);
$form_state['redirect'] = 'admin/structure/menu/manage/' . $item['menu_name'];
}
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index ab4b2e6086c..da2d9569c86 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -342,7 +342,7 @@ function node_type_form_submit($form, &$form_state) {
elseif ($status == SAVED_NEW) {
node_add_body_field($type);
drupal_set_message(t('The content type %name has been added.', $t_args));
- watchdog('node', 'Added content type %name.', $t_args, WATCHDOG_NOTICE, l(t('view'), 'admin/structure/types'));
+ watchdog('node', 'Added content type %name.', $t_args, LOG_NOTICE, l(t('view'), 'admin/structure/types'));
}
$form_state['redirect'] = 'admin/structure/types';
@@ -425,7 +425,7 @@ function node_type_delete_confirm_submit($form, &$form_state) {
variable_del('node_preview_' . $form_state['values']['type']);
$t_args = array('%name' => $form_state['values']['name']);
drupal_set_message(t('The content type %name has been deleted.', $t_args));
- watchdog('menu', 'Deleted content type %name.', $t_args, WATCHDOG_NOTICE);
+ watchdog('menu', 'Deleted content type %name.', $t_args, LOG_NOTICE);
node_types_rebuild();
menu_rebuild();
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index facc7f6ee50..5879963b5eb 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -409,11 +409,11 @@ function node_form_submit($form, &$form_state) {
$t_args = array('@type' => node_type_get_name($node), '%title' => $node->title);
if ($insert) {
- watchdog('content', '@type: added %title.', $watchdog_args, WATCHDOG_NOTICE, $node_link);
+ watchdog('content', '@type: added %title.', $watchdog_args, LOG_NOTICE, $node_link);
drupal_set_message(t('@type %title has been created.', $t_args));
}
else {
- watchdog('content', '@type: updated %title.', $watchdog_args, WATCHDOG_NOTICE, $node_link);
+ watchdog('content', '@type: updated %title.', $watchdog_args, LOG_NOTICE, $node_link);
drupal_set_message(t('@type %title has been updated.', $t_args));
}
if ($node->nid) {
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 7673de8864a..ed914397cdc 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -862,7 +862,7 @@ function openid_verify_assertion_nonce($service, $response) {
$nonce_timestamp = gmmktime($hour, $minutes, $seconds, $month, $day, $year);
}
else {
- watchdog('openid', 'Nonce from @endpoint rejected because it is not correctly formatted, nonce: @nonce.', array('@endpoint' => $service['uri'], '@nonce' => $response['openid.response_nonce']), WATCHDOG_WARNING);
+ watchdog('openid', 'Nonce from @endpoint rejected because it is not correctly formatted, nonce: @nonce.', array('@endpoint' => $service['uri'], '@nonce' => $response['openid.response_nonce']), LOG_WARNING);
return FALSE;
}
@@ -871,7 +871,7 @@ function openid_verify_assertion_nonce($service, $response) {
$time = time();
$expiry = 900;
if ($nonce_timestamp <= $time - $expiry || $nonce_timestamp >= $time + $expiry) {
- watchdog('openid', 'Nonce received from @endpoint is out of range (time difference: @intervals). Check possible clock skew.', array('@endpoint' => $service['uri'], '@interval' => $time - $nonce_timestamp), WATCHDOG_WARNING);
+ watchdog('openid', 'Nonce received from @endpoint is out of range (time difference: @intervals). Check possible clock skew.', array('@endpoint' => $service['uri'], '@interval' => $time - $nonce_timestamp), LOG_WARNING);
return FALSE;
}
@@ -894,7 +894,7 @@ function openid_verify_assertion_nonce($service, $response) {
return TRUE;
}
else {
- watchdog('openid', 'Nonce replay attempt blocked from @ip, nonce: @nonce.', array('@ip' => ip_address(), '@nonce' => $response['openid.response_nonce']), WATCHDOG_CRITICAL);
+ watchdog('openid', 'Nonce replay attempt blocked from @ip, nonce: @nonce.', array('@ip' => ip_address(), '@nonce' => $response['openid.response_nonce']), LOG_CRIT);
return FALSE;
}
}
diff --git a/modules/profile/profile.admin.inc b/modules/profile/profile.admin.inc
index d6ac3c310fa..622a96c41b9 100644
--- a/modules/profile/profile.admin.inc
+++ b/modules/profile/profile.admin.inc
@@ -374,7 +374,7 @@ function profile_field_form_submit($form, &$form_state) {
->fields($values)
->execute();
drupal_set_message(t('The field has been created.'));
- watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_state['values']['title'], '%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/config/people/profile'));
+ watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_state['values']['title'], '%category' => $form_state['values']['category']), LOG_NOTICE, l(t('view'), 'admin/config/people/profile'));
}
else {
db_update('profile_field')
@@ -422,7 +422,7 @@ function profile_field_delete_submit($form, &$form_state) {
cache_clear_all();
drupal_set_message(t('The field %field has been deleted.', array('%field' => $form_state['values']['title'])));
- watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/config/people/profile'));
+ watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_state['values']['title']), LOG_NOTICE, l(t('view'), 'admin/config/people/profile'));
$form_state['redirect'] = 'admin/config/people/profile';
return;
diff --git a/modules/search/search.pages.inc b/modules/search/search.pages.inc
index 833ea8bccd5..ebf8f60dbbe 100644
--- a/modules/search/search.pages.inc
+++ b/modules/search/search.pages.inc
@@ -59,7 +59,7 @@ function search_view($module = NULL, $keys = '') {
// Only search if there are keywords or non-empty conditions.
if ($keys || !empty($conditions)) {
// Log the search keys.
- watchdog('search', 'Searched %type for %keys.', array('%keys' => $keys, '%type' => $info['title']), WATCHDOG_NOTICE, l(t('results'), 'search/' . $info['path'] . '/' . $keys));
+ watchdog('search', 'Searched %type for %keys.', array('%keys' => $keys, '%type' => $info['title']), LOG_NOTICE, l(t('results'), 'search/' . $info['path'] . '/' . $keys));
// Collect the search results.
$results = search_data($keys, $info['module'], $conditions);
diff --git a/modules/simpletest/tests/actions_loop_test.module b/modules/simpletest/tests/actions_loop_test.module
index 77764907b9e..afc5a260f47 100644
--- a/modules/simpletest/tests/actions_loop_test.module
+++ b/modules/simpletest/tests/actions_loop_test.module
@@ -70,7 +70,7 @@ function actions_loop_test_log() {
* Replacement of the watchdog() function that eliminates the use of semaphores
* so that we can test the abortion of an action loop.
*/
-function watchdog_skip_semaphore($type, $message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = NULL) {
+function watchdog_skip_semaphore($type, $message, $variables = array(), $severity = LOG_NOTICE, $link = NULL) {
global $user, $base_root;
// Prepare the fields to be logged
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 4664f046dc9..9181fba3358 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -2063,7 +2063,7 @@ class ParseInfoFilesTestCase extends DrupalWebTestCase {
function testParseInfoFile() {
$info_values = drupal_parse_info_file(drupal_get_path('module', 'simpletest') . '/tests/common_test_info.txt');
$this->assertEqual($info_values['simple_string'], 'A simple string', t('Simple string value was parsed correctly.'), t('System'));
- $this->assertEqual($info_values['simple_constant'], WATCHDOG_INFO, t('Constant value was parsed correctly.'), t('System'));
+ $this->assertEqual($info_values['simple_constant'], LOG_INFO, t('Constant value was parsed correctly.'), t('System'));
$this->assertEqual($info_values['double_colon'], 'dummyClassName::', t('Value containing double-colon was parsed correctly.'), t('System'));
}
}
diff --git a/modules/simpletest/tests/common_test_info.txt b/modules/simpletest/tests/common_test_info.txt
index ae217b91703..e3d85a13ffd 100644
--- a/modules/simpletest/tests/common_test_info.txt
+++ b/modules/simpletest/tests/common_test_info.txt
@@ -2,7 +2,7 @@
simple_string = A simple string
; Test that constants can be used as values.
-simple_constant = WATCHDOG_INFO
+simple_constant = LOG_INFO
; After parsing the .info file, 'double_colon' should hold the literal value.
; Parsing should not throw a fatal error or try to access a class constant.
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index f11c304aee1..d494a06825f 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -2206,21 +2206,21 @@ function hook_xmlrpc_alter(&$methods) {
* @param $log_entry
* An associative array containing the following keys:
* - type: The type of message for this entry. For contributed modules, this is
- * normally the module name. Do not use 'debug', use severity WATCHDOG_DEBUG instead.
+ * normally the module name. Do not use 'debug', use severity LOG_DEBUG instead.
* - user: The user object for the user who was logged in when the event happened.
* - request_uri: The Request URI for the page the event happened in.
* - referer: The page that referred the use to the page where the event occurred.
* - ip: The IP address where the request for the page came from.
* - timestamp: The UNIX timestamp of the date/time the event occurred
* - severity: One of the following values as defined in RFC 3164 http://www.faqs.org/rfcs/rfc3164.html
- * WATCHDOG_EMERGENCY Emergency: system is unusable
- * WATCHDOG_ALERT Alert: action must be taken immediately
- * WATCHDOG_CRITICAL Critical: critical conditions
- * WATCHDOG_ERROR Error: error conditions
- * WATCHDOG_WARNING Warning: warning conditions
- * WATCHDOG_NOTICE Notice: normal but significant condition
- * WATCHDOG_INFO Informational: informational messages
- * WATCHDOG_DEBUG Debug: debug-level messages
+ * LOG_EMERG Emergency: system is unusable
+ * LOG_ALERT Alert: action must be taken immediately
+ * LOG_CRIT Critical: critical conditions
+ * LOG_ERR Error: error conditions
+ * LOG_WARNING Warning: warning conditions
+ * LOG_NOTICE Notice: normal but significant condition
+ * LOG_INFO Informational: informational messages
+ * LOG_DEBUG Debug: debug-level messages
* - link: an optional link provided by the module that called the watchdog() function.
* - message: The text of the message to be logged.
*/
@@ -2228,14 +2228,14 @@ function hook_watchdog(array $log_entry) {
global $base_url, $language;
$severity_list = array(
- WATCHDOG_EMERGENCY => t('Emergency'),
- WATCHDOG_ALERT => t('Alert'),
- WATCHDOG_CRITICAL => t('Critical'),
- WATCHDOG_ERROR => t('Error'),
- WATCHDOG_WARNING => t('Warning'),
- WATCHDOG_NOTICE => t('Notice'),
- WATCHDOG_INFO => t('Info'),
- WATCHDOG_DEBUG => t('Debug'),
+ LOG_EMERG => t('Emergency'),
+ LOG_ALERT => t('Alert'),
+ LOG_CRITI => t('Critical'),
+ LOG_ERR => t('Error'),
+ LOG_WARNING => t('Warning'),
+ LOG_NOTICE => t('Notice'),
+ LOG_INFO => t('Info'),
+ LOG_DEBUG => t('Debug'),
);
$to = 'someone@example.com';
diff --git a/modules/system/system.module b/modules/system/system.module
index 21b23f4c223..3ebc6570670 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2145,13 +2145,13 @@ function system_check_directory($form_element) {
if (!is_dir($directory) && !drupal_mkdir($directory, NULL, TRUE)) {
// If the directory does not exists and cannot be created.
form_set_error($form_element['#parents'][0], t('The directory %directory does not exist and could not be created.', array('%directory' => $directory)));
- watchdog('file system', 'The directory %directory does not exist and could not be created.', array('%directory' => $directory), WATCHDOG_ERROR);
+ watchdog('file system', 'The directory %directory does not exist and could not be created.', array('%directory' => $directory), LOG_ERR);
}
if (is_dir($directory) && !is_writable($directory) && !drupal_chmod($directory)) {
// If the directory is not writable and cannot be made so.
form_set_error($form_element['#parents'][0], t('The directory %directory exists but is not writable and could not be made writable.', array('%directory' => $directory)));
- watchdog('file system', 'The directory %directory exists but is not writable and could not be made writable.', array('%directory' => $directory), WATCHDOG_ERROR);
+ watchdog('file system', 'The directory %directory exists but is not writable and could not be made writable.', array('%directory' => $directory), LOG_ERR);
}
elseif (is_dir($directory)) {
if ($form_element['#name'] == 'file_public_path') {
@@ -2987,11 +2987,11 @@ function system_cron() {
$references = file_usage_list($file);
if (empty($references)) {
if (!file_delete($file)) {
- watchdog('file system', 'Could not delete temporary file "%path" during garbage collection', array('%path' => $file->uri), WATCHDOG_ERROR);
+ watchdog('file system', 'Could not delete temporary file "%path" during garbage collection', array('%path' => $file->uri), LOG_ERR);
}
}
else {
- watchdog('file system', 'Did not delete temporary file "%path" during garbage collection, because it is in use by the following modules: %modules.', array('%path' => $file->uri, '%modules' => implode(', ', array_keys($references))), WATCHDOG_INFO);
+ watchdog('file system', 'Did not delete temporary file "%path" during garbage collection, because it is in use by the following modules: %modules.', array('%path' => $file->uri, '%modules' => implode(', ', array_keys($references))), LOG_INFO);
}
}
}
diff --git a/modules/system/system.test b/modules/system/system.test
index 125cb8faa2a..402fecc4579 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -78,7 +78,7 @@ class ModuleTestCase extends DrupalWebTestCase {
* @param $link
* A link to associate with the message.
*/
- function assertLogMessage($type, $message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = '') {
+ function assertLogMessage($type, $message, $variables = array(), $severity = LOG_NOTICE, $link = '') {
$count = db_select('watchdog', 'w')
->condition('type', $type)
->condition('message', $message)
@@ -126,8 +126,8 @@ class EnableDisableTestCase extends ModuleTestCase {
$this->assertText(t('hook_modules_enabled fired for aggregator'), t('hook_modules_enabled fired.'));
$this->assertModules(array('aggregator'), TRUE);
$this->assertTableCount('aggregator', TRUE);
- $this->assertLogMessage('system', "%module module installed.", array('%module' => 'aggregator'), WATCHDOG_INFO);
- $this->assertLogMessage('system', "%module module enabled.", array('%module' => 'aggregator'), WATCHDOG_INFO);
+ $this->assertLogMessage('system', "%module module installed.", array('%module' => 'aggregator'), LOG_INFO);
+ $this->assertLogMessage('system', "%module module enabled.", array('%module' => 'aggregator'), LOG_INFO);
// Disable aggregator, check tables, uninstall aggregator, check tables.
$edit = array();
@@ -139,7 +139,7 @@ class EnableDisableTestCase extends ModuleTestCase {
$this->assertText(t('hook_modules_disabled fired for aggregator'), t('hook_modules_disabled fired.'));
$this->assertModules(array('aggregator'), FALSE);
$this->assertTableCount('aggregator', TRUE);
- $this->assertLogMessage('system', "%module module disabled.", array('%module' => 'aggregator'), WATCHDOG_INFO);
+ $this->assertLogMessage('system', "%module module disabled.", array('%module' => 'aggregator'), LOG_INFO);
// Uninstall the module.
$edit = array();
@@ -153,7 +153,7 @@ class EnableDisableTestCase extends ModuleTestCase {
$this->assertText(t('hook_modules_uninstalled fired for aggregator'), t('hook_modules_uninstalled fired.'));
$this->assertModules(array('aggregator'), FALSE);
$this->assertTableCount('aggregator', FALSE);
- $this->assertLogMessage('system', "%module module uninstalled.", array('%module' => 'aggregator'), WATCHDOG_INFO);
+ $this->assertLogMessage('system', "%module module uninstalled.", array('%module' => 'aggregator'), LOG_INFO);
// Reinstall (and enable) aggregator module.
$edit = array();
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index 13b2ce88e8b..7ec5aba1905 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -194,12 +194,12 @@ function taxonomy_form_vocabulary_submit($form, &$form_state) {
switch (taxonomy_vocabulary_save($vocabulary)) {
case SAVED_NEW:
drupal_set_message(t('Created new vocabulary %name.', array('%name' => $vocabulary->name)));
- watchdog('taxonomy', 'Created new vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->machine_name . '/edit'));
+ watchdog('taxonomy', 'Created new vocabulary %name.', array('%name' => $vocabulary->name), LOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->machine_name . '/edit'));
break;
case SAVED_UPDATED:
drupal_set_message(t('Updated vocabulary %name.', array('%name' => $vocabulary->name)));
- watchdog('taxonomy', 'Updated vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->machine_name . '/edit'));
+ watchdog('taxonomy', 'Updated vocabulary %name.', array('%name' => $vocabulary->name), LOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->machine_name . '/edit'));
break;
}
@@ -796,11 +796,11 @@ function taxonomy_form_term_submit($form, &$form_state) {
switch ($status) {
case SAVED_NEW:
drupal_set_message(t('Created new term %term.', array('%term' => $term->name)));
- watchdog('taxonomy', 'Created new term %term.', array('%term' => $term->name), WATCHDOG_NOTICE, l(t('edit'), 'taxonomy/term/' . $term->tid . '/edit'));
+ watchdog('taxonomy', 'Created new term %term.', array('%term' => $term->name), LOG_NOTICE, l(t('edit'), 'taxonomy/term/' . $term->tid . '/edit'));
break;
case SAVED_UPDATED:
drupal_set_message(t('Updated term %term.', array('%term' => $term->name)));
- watchdog('taxonomy', 'Updated term %term.', array('%term' => $term->name), WATCHDOG_NOTICE, l(t('edit'), 'taxonomy/term/' . $term->tid . '/edit'));
+ watchdog('taxonomy', 'Updated term %term.', array('%term' => $term->name), LOG_NOTICE, l(t('edit'), 'taxonomy/term/' . $term->tid . '/edit'));
// Clear the page and block caches to avoid stale data.
cache_clear_all();
break;
@@ -898,7 +898,7 @@ function taxonomy_term_confirm_delete_submit($form, &$form_state) {
taxonomy_term_delete($form_state['values']['tid']);
taxonomy_check_vocabulary_hierarchy($form['#vocabulary'], $form_state['values']);
drupal_set_message(t('Deleted term %name.', array('%name' => $form_state['values']['name'])));
- watchdog('taxonomy', 'Deleted term %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
+ watchdog('taxonomy', 'Deleted term %name.', array('%name' => $form_state['values']['name']), LOG_NOTICE);
$form_state['redirect'] = 'admin/structure/taxonomy';
cache_clear_all();
return;
@@ -938,7 +938,7 @@ function taxonomy_vocabulary_confirm_delete($form, &$form_state, $vid) {
function taxonomy_vocabulary_confirm_delete_submit($form, &$form_state) {
$status = taxonomy_vocabulary_delete($form_state['values']['vid']);
drupal_set_message(t('Deleted vocabulary %name.', array('%name' => $form_state['values']['name'])));
- watchdog('taxonomy', 'Deleted vocabulary %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
+ watchdog('taxonomy', 'Deleted vocabulary %name.', array('%name' => $form_state['values']['name']), LOG_NOTICE);
$form_state['redirect'] = 'admin/structure/taxonomy';
cache_clear_all();
return;
@@ -978,6 +978,6 @@ function taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, &$form_sta
->condition('vid', $form_state['values']['vid'])
->execute();
drupal_set_message(t('Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name'])));
- watchdog('taxonomy', 'Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
+ watchdog('taxonomy', 'Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name']), LOG_NOTICE);
$form_state['redirect'] = 'admin/structure/taxonomy/' . $form_state['values']['machine_name'];
}
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 0596bde4c1c..afaddeb580a 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -352,7 +352,7 @@ function user_admin_settings() {
$picture_path = file_default_scheme() . '://' . variable_get('user_picture_path', 'pictures');
if (!file_prepare_directory($picture_path, FILE_CREATE_DIRECTORY)) {
form_set_error('user_picture_path', t('The directory %directory does not exist or is not writable.', array('%directory' => $picture_path)));
- watchdog('file system', 'The directory %directory does not exist or is not writable.', array('%directory' => $picture_path), WATCHDOG_ERROR);
+ watchdog('file system', 'The directory %directory does not exist or is not writable.', array('%directory' => $picture_path), LOG_ERR);
}
}
$picture_support = variable_get('user_pictures', 0);
diff --git a/modules/user/user.module b/modules/user/user.module
index 92a55bcf472..0c437ad41bf 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2314,7 +2314,7 @@ function user_cancel($edit, $uid, $method) {
if (!$account) {
drupal_set_message(t('The user account %id does not exist.', array('%id' => $uid)), 'error');
- watchdog('user', 'Attempted to cancel non-existing user account: %id.', array('%id' => $uid), WATCHDOG_ERROR);
+ watchdog('user', 'Attempted to cancel non-existing user account: %id.', array('%id' => $uid), LOG_ERR);
return;
}
@@ -2365,7 +2365,7 @@ function _user_cancel($edit, $account, $method) {
}
user_save($account, array('status' => 0));
drupal_set_message(t('%name has been disabled.', array('%name' => $account->name)));
- watchdog('user', 'Blocked user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
+ watchdog('user', 'Blocked user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), LOG_NOTICE);
break;
case 'user_cancel_reassign':
@@ -2376,7 +2376,7 @@ function _user_cancel($edit, $account, $method) {
}
user_delete($account->uid);
drupal_set_message(t('%name has been deleted.', array('%name' => $account->name)));
- watchdog('user', 'Deleted user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
+ watchdog('user', 'Deleted user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), LOG_NOTICE);
break;
}
@@ -3061,7 +3061,7 @@ function user_user_operations($form = array(), $form_state = array()) {
);
}
else {
- watchdog('security', 'Detected malicious attempt to alter protected user fields.', array(), WATCHDOG_WARNING);
+ watchdog('security', 'Detected malicious attempt to alter protected user fields.', array(), LOG_WARNING);
return;
}
}
@@ -3719,7 +3719,7 @@ function user_register_submit($form, &$form_state) {
$form_state['user'] = $account;
$form_state['values']['uid'] = $account->uid;
- watchdog('user', 'New user: %name (%email).', array('%name' => $form_state['values']['name'], '%email' => $form_state['values']['mail']), WATCHDOG_NOTICE, l(t('edit'), 'user/' . $account->uid . '/edit'));
+ watchdog('user', 'New user: %name (%email).', array('%name' => $form_state['values']['name'], '%email' => $form_state['values']['mail']), LOG_NOTICE, l(t('edit'), 'user/' . $account->uid . '/edit'));
// Add plain text password into user account to generate mail tokens.
$account->password = $pass;
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 697a82d2c2c..0d06ff27796 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -443,7 +443,7 @@ function user_cancel_confirm_form_submit($form, &$form_state) {
$account = user_save($account, $edit);
_user_mail_notify('cancel_confirm', $account);
drupal_set_message(t('A confirmation request to cancel your account has been sent to your e-mail address.'));
- watchdog('user', 'Sent account cancellation request to %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
+ watchdog('user', 'Sent account cancellation request to %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), LOG_NOTICE);
$form_state['redirect'] = "user/$account->uid";
}
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
old mode 100644
new mode 100755
diff --git a/update.php b/update.php
index 5a52ea5396e..e3b63dd1474 100644
--- a/update.php
+++ b/update.php
@@ -251,7 +251,7 @@ function update_info_page() {
function update_access_denied_page() {
drupal_add_http_header('Status', '403 Forbidden');
- watchdog('access denied', 'update.php', NULL, WATCHDOG_WARNING);
+ watchdog('access denied', 'update.php', NULL, LOG_WARNING);
drupal_set_title('Access denied');
return 'Access denied. You are not authorized to access this page. Log in using either an account with the administer software updates permission or the site maintenance account (the account you created during installation). If you cannot log in, you will have to edit settings.php to bypass this access check. To do this: