diff options
| -rw-r--r-- | includes/bootstrap.inc | 39 | ||||
| -rw-r--r-- | includes/cache.inc | 62 | ||||
| -rw-r--r-- | includes/common.inc | 266 | ||||
| -rw-r--r-- | includes/theme.inc | 8 |
4 files changed, 86 insertions, 289 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index aee7d588a..3c175856e 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1565,9 +1565,48 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { } /** + * Custom PHP error handler. + * + * @param $error_level + * The level of the error raised. + * @param $message + * The error message. + * @param $filename + * The filename that the error was raised in. + * @param $line + * The line number the error was raised at. + * @param $context + * An array that points to the active symbol table at the point the error occurred. + */ +function _drupal_error_handler($error_level, $message, $filename, $line, $context) { + require_once DRUPAL_ROOT . '/includes/errors.inc'; + _drupal_error_handler_real($error_level, $message, $filename, $line, $context); +} + +/** + * Custom PHP exception handler. + * + * Uncaught exceptions are those not enclosed in a try/catch block. They are + * always fatal: the execution of the script will stop as soon as the exception + * handler exits. + * + * @param $exception + * The exception object that was thrown. + */ +function _drupal_exception_handler($exception) { + require_once DRUPAL_ROOT . '/includes/errors.inc'; + // Log the message to the watchdog and return an error page to the user. + _drupal_log_error(_drupal_decode_exception($exception), TRUE); +} + +/** * Bootstrap configuration: Setup script environment and load settings.php. */ function _drupal_bootstrap_configuration() { + // Set the Drupal custom error handler. + set_error_handler('_drupal_error_handler'); + set_exception_handler('_drupal_exception_handler'); + drupal_environment_initialize(); // Start a page timer: timer_start('page'); diff --git a/includes/cache.inc b/includes/cache.inc index 453e2dc9b..e691c1720 100644 --- a/includes/cache.inc +++ b/includes/cache.inc @@ -309,29 +309,42 @@ class DrupalDatabaseCache implements DrupalCacheInterface { } function get($cid) { - // Garbage collection necessary when enforcing a minimum cache lifetime. - $this->garbageCollection($this->bin); - $cache = db_query("SELECT data, created, headers, expire, serialized FROM {" . $this->bin . "} WHERE cid = :cid", array(':cid' => $cid))->fetchObject(); - - return $this->prepareItem($cache); + try { + // Garbage collection necessary when enforcing a minimum cache lifetime. + $this->garbageCollection($this->bin); + $cache = db_query("SELECT data, created, headers, expire, serialized FROM {" . $this->bin . "} WHERE cid = :cid", array(':cid' => $cid))->fetchObject(); + return $this->prepareItem($cache); + } + catch (Exception $e) { + // If the database is never going to be available, cache requests should + // return FALSE in order to allow exception handling to occur. + return FALSE; + } } function getMultiple(&$cids) { - // Garbage collection necessary when enforcing a minimum cache lifetime. - $this->garbageCollection($this->bin); - $query = db_select($this->bin); - $query->fields($this->bin, array('cid', 'data', 'created', 'headers', 'expire', 'serialized')); - $query->condition($this->bin . '.cid', $cids, 'IN'); - $result = $query->execute(); - $cache = array(); - foreach ($result as $item) { - $item = $this->prepareItem($item); - if ($item) { - $cache[$item->cid] = $item; + try { + // Garbage collection necessary when enforcing a minimum cache lifetime. + $this->garbageCollection($this->bin); + $query = db_select($this->bin); + $query->fields($this->bin, array('cid', 'data', 'created', 'headers', 'expire', 'serialized')); + $query->condition($this->bin . '.cid', $cids, 'IN'); + $result = $query->execute(); + $cache = array(); + foreach ($result as $item) { + $item = $this->prepareItem($item); + if ($item) { + $cache[$item->cid] = $item; + } } + $cids = array_diff($cids, array_keys($cache)); + return $cache; + } + catch (Exception $e) { + // If the database is never going to be available, cache requests should + // return FALSE in order to allow exception handling to occur. + return array(); } - $cids = array_diff($cids, array_keys($cache)); - return $cache; } /** @@ -415,10 +428,15 @@ class DrupalDatabaseCache implements DrupalCacheInterface { $fields['serialized'] = 0; } - db_merge($this->bin) - ->key(array('cid' => $cid)) - ->fields($fields) - ->execute(); + try { + db_merge($this->bin) + ->key(array('cid' => $cid)) + ->fields($fields) + ->execute(); + } + catch (Exception $e) { + // The database may not be available, so we'll ignore cache_set requests. + } } function clear($cid = NULL, $wildcard = FALSE) { diff --git a/includes/common.inc b/includes/common.inc index cea7b037b..841396ec7 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -41,21 +41,6 @@ */ /** - * Error reporting level: display no errors. - */ -define('ERROR_REPORTING_HIDE', 0); - -/** - * Error reporting level: display errors and warnings. - */ -define('ERROR_REPORTING_DISPLAY_SOME', 1); - -/** - * Error reporting level: display all messages. - */ -define('ERROR_REPORTING_DISPLAY_ALL', 2); - -/** * Return status for saving which involved creating a new item. */ define('SAVED_NEW', 1); @@ -1014,253 +999,6 @@ function drupal_http_request($url, array $options = array()) { * @} End of "HTTP handling". */ -/** - * Map PHP error constants to watchdog severity levels. - * The error constants are documented at - * http://php.net/manual/en/errorfunc.constants.php - */ -function drupal_error_levels() { - $types = array( - E_ERROR => array('Error', WATCHDOG_ERROR), - E_WARNING => array('Warning', WATCHDOG_WARNING), - E_PARSE => array('Parse error', WATCHDOG_ERROR), - E_NOTICE => array('Notice', WATCHDOG_NOTICE), - E_CORE_ERROR => array('Core error', WATCHDOG_ERROR), - E_CORE_WARNING => array('Core warning', WATCHDOG_WARNING), - E_COMPILE_ERROR => array('Compile error', WATCHDOG_ERROR), - E_COMPILE_WARNING => array('Compile warning', WATCHDOG_WARNING), - E_USER_ERROR => array('User error', WATCHDOG_ERROR), - E_USER_WARNING => array('User warning', WATCHDOG_WARNING), - E_USER_NOTICE => array('User notice', WATCHDOG_NOTICE), - E_STRICT => array('Strict warning', WATCHDOG_DEBUG), - E_RECOVERABLE_ERROR => array('Recoverable fatal error', WATCHDOG_ERROR), - ); - // E_DEPRECATED and E_USER_DEPRECATED were added in PHP 5.3.0. - if (defined('E_DEPRECATED')) { - $types[E_DEPRECATED] = array('Deprecated function', WATCHDOG_DEBUG); - $types[E_USER_DEPRECATED] = array('User deprecated function', WATCHDOG_DEBUG); - } - return $types; -} - -/** - * Custom PHP error handler. - * - * @param $error_level - * The level of the error raised. - * @param $message - * The error message. - * @param $filename - * The filename that the error was raised in. - * @param $line - * The line number the error was raised at. - * @param $context - * An array that points to the active symbol table at the point the error occurred. - */ -function _drupal_error_handler($error_level, $message, $filename, $line, $context) { - if ($error_level & error_reporting()) { - $types = drupal_error_levels(); - list($severity_msg, $severity_level) = $types[$error_level]; - $caller = _drupal_get_last_caller(debug_backtrace()); - - // We treat recoverable errors as fatal. - _drupal_log_error(array( - '%type' => isset($types[$error_level]) ? $severity_msg : 'Unknown error', - '%message' => $message, - '%function' => $caller['function'], - '%file' => $caller['file'], - '%line' => $caller['line'], - 'severity_level' => $severity_level, - ), $error_level == E_RECOVERABLE_ERROR); - } -} - -/** - * Custom PHP exception handler. - * - * Uncaught exceptions are those not enclosed in a try/catch block. They are - * always fatal: the execution of the script will stop as soon as the exception - * handler exits. - * - * @param $exception - * The exception object that was thrown. - */ -function _drupal_exception_handler($exception) { - // Log the message to the watchdog and return an error page to the user. - _drupal_log_error(_drupal_decode_exception($exception), TRUE); -} - -/** - * Decode an exception, especially to retrieve the correct caller. - * - * @param $exception - * The exception object that was thrown. - * @return An error in the format expected by _drupal_log_error(). - */ -function _drupal_decode_exception($exception) { - $message = $exception->getMessage(); - - $backtrace = $exception->getTrace(); - // Add the line throwing the exception to the backtrace. - array_unshift($backtrace, array('line' => $exception->getLine(), 'file' => $exception->getFile())); - - // For PDOException errors, we try to return the initial caller, - // skipping internal functions of the database layer. - if ($exception instanceof PDOException) { - // The first element in the stack is the call, the second element gives us the caller. - // We skip calls that occurred in one of the classes of the database layer - // or in one of its global functions. - $db_functions = array('db_query', 'db_query_range'); - while (!empty($backtrace[1]) && ($caller = $backtrace[1]) && - ((isset($caller['class']) && (strpos($caller['class'], 'Query') !== FALSE || strpos($caller['class'], 'Database') !== FALSE || strpos($caller['class'], 'PDO') !== FALSE)) || - in_array($caller['function'], $db_functions))) { - // We remove that call. - array_shift($backtrace); - } - if (isset($exception->query_string, $exception->args)) { - $message .= ": " . $exception->query_string . "; " . print_r($exception->args, TRUE); - } - } - $caller = _drupal_get_last_caller($backtrace); - - return array( - '%type' => get_class($exception), - '%message' => $message, - '%function' => $caller['function'], - '%file' => $caller['file'], - '%line' => $caller['line'], - 'severity_level' => WATCHDOG_ERROR, - ); -} - -/** - * Log a PHP error or exception, display an error page in fatal cases. - * - * @param $error - * An array with the following keys: %type, %message, %function, %file, %line. - * @param $fatal - * TRUE if the error is fatal. - */ -function _drupal_log_error($error, $fatal = FALSE) { - // Initialize a maintenance theme if the bootstrap was not complete. - // Do it early because drupal_set_message() triggers a drupal_theme_initialize(). - if ($fatal && (drupal_get_bootstrap_phase() != DRUPAL_BOOTSTRAP_FULL)) { - unset($GLOBALS['theme']); - if (!defined('MAINTENANCE_MODE')) { - define('MAINTENANCE_MODE', 'error'); - } - drupal_maintenance_theme(); - } - - // When running inside the testing framework, we relay the errors - // to the tested site by the way of HTTP headers. - if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/^simpletest\d+;/", $_SERVER['HTTP_USER_AGENT']) && !headers_sent() && (!defined('SIMPLETEST_COLLECT_ERRORS') || SIMPLETEST_COLLECT_ERRORS)) { - // $number does not use drupal_static as it should not be reset - // as it uniquely identifies each PHP error. - static $number = 0; - $assertion = array( - $error['%message'], - $error['%type'], - array( - 'function' => $error['%function'], - 'file' => $error['%file'], - 'line' => $error['%line'], - ), - ); - header('X-Drupal-Assertion-' . $number . ': ' . rawurlencode(serialize($assertion))); - $number++; - } - - try { - watchdog('php', '%type: %message in %function (line %line of %file).', $error, $error['severity_level']); - } - catch (Exception $e) { - // Ignore any additional watchdog exception, as that probably means - // that the database was not initialized correctly. - } - - if ($fatal) { - drupal_add_http_header('500 Service unavailable (with message)'); - } - - if (drupal_is_cli()) { - if ($fatal) { - // When called from CLI, simply output a plain text message. - print html_entity_decode(strip_tags(t('%type: %message in %function (line %line of %file).', $error))). "\n"; - exit; - } - } - if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') { - if ($fatal) { - // When called from JavaScript, simply output the error message. - print t('%type: %message in %function (line %line of %file).', $error); - exit; - } - } - else { - // Display the message if the current error reporting level allows this type - // of message to be displayed, and unconditionally in update.php. - $error_level = variable_get('error_level', ERROR_REPORTING_DISPLAY_ALL); - $display_error = $error_level == ERROR_REPORTING_DISPLAY_ALL || ($error_level == ERROR_REPORTING_DISPLAY_SOME && $error['%type'] != 'Notice'); - if ($display_error || (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'update')) { - $class = 'error'; - - // If error type is 'User notice' then treat it as debug information - // instead of an error message, see dd(). - if ($error['%type'] == 'User notice') { - $error['%type'] = 'Debug'; - $class = 'status'; - } - - drupal_set_message(t('%type: %message in %function (line %line of %file).', $error), $class); - } - - if ($fatal) { - drupal_set_title(t('Error')); - // We fallback to a maintenance page at this point, because the page generation - // itself can generate errors. - print theme('maintenance_page', array('content' => t('The website encountered an unexpected error. Please try again later.'))); - exit; - } - } -} - -/** - * Gets the last caller from a backtrace. - * - * @param $backtrace - * A standard PHP backtrace. - * @return - * An associative array with keys 'file', 'line' and 'function'. - */ -function _drupal_get_last_caller($backtrace) { - // Errors that occur inside PHP internal functions do not generate - // information about file and line. Ignore black listed functions. - $blacklist = array('debug'); - while (($backtrace && !isset($backtrace[0]['line'])) || - (isset($backtrace[1]['function']) && in_array($backtrace[1]['function'], $blacklist))) { - array_shift($backtrace); - } - - // The first trace is the call itself. - // It gives us the line and the file of the last call. - $call = $backtrace[0]; - - // The second call give us the function where the call originated. - if (isset($backtrace[1])) { - if (isset($backtrace[1]['class'])) { - $call['function'] = $backtrace[1]['class'] . $backtrace[1]['type'] . $backtrace[1]['function'] . '()'; - } - else { - $call['function'] = $backtrace[1]['function'] . '()'; - } - } - else { - $call['function'] = 'main()'; - } - return $call; -} - function _fix_gpc_magic(&$item) { if (is_array($item)) { array_walk($item, '_fix_gpc_magic'); @@ -4516,9 +4254,7 @@ function _drupal_bootstrap_full() { require_once DRUPAL_ROOT . '/includes/actions.inc'; require_once DRUPAL_ROOT . '/includes/ajax.inc'; require_once DRUPAL_ROOT . '/includes/token.inc'; - // Set the Drupal custom error handler. - set_error_handler('_drupal_error_handler'); - set_exception_handler('_drupal_exception_handler'); + require_once DRUPAL_ROOT . '/includes/errors.inc'; // Detect string handling method unicode_check(); diff --git a/includes/theme.inc b/includes/theme.inc index 7668ab9e4..d8bec3403 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -2543,6 +2543,10 @@ function template_preprocess_maintenance_page(&$variables) { $head_title[] = variable_get('site_slogan', ''); } } + + // set the default language if necessary + $language = isset($GLOBALS['language']) ? $GLOBALS['language'] : language_default(); + $variables['head_title'] = implode(' | ', $head_title); $variables['base_path'] = base_path(); $variables['front_page'] = url(); @@ -2550,8 +2554,8 @@ function template_preprocess_maintenance_page(&$variables) { $variables['feed_icons'] = ''; $variables['head'] = drupal_get_html_head(); $variables['help'] = ''; - $variables['language'] = $GLOBALS['language']; - $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; + $variables['language'] = $language; + $variables['language']->dir = $language->direction ? 'rtl' : 'ltr'; $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; $variables['main_menu'] = array(); |