From b15cc7d6f4c77fb941c74670eb58fb07bd9c7d9c Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Fri, 3 May 2013 12:09:57 +0200 Subject: Check Google spell check service response for errors and report them accordingly --- program/lib/Roundcube/rcube_spellchecker.php | 15 ++++++++++----- program/steps/utils/spell.inc | 7 +++++++ 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'program') diff --git a/program/lib/Roundcube/rcube_spellchecker.php b/program/lib/Roundcube/rcube_spellchecker.php index 816bcad2f..2b48fca92 100644 --- a/program/lib/Roundcube/rcube_spellchecker.php +++ b/program/lib/Roundcube/rcube_spellchecker.php @@ -314,11 +314,6 @@ class rcube_spellchecker if (!$this->plink) { if (!extension_loaded('pspell')) { $this->error = "Pspell extension not available"; - rcube::raise_error(array( - 'code' => 500, 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => $this->error), true, false); - return; } @@ -372,9 +367,19 @@ class rcube_spellchecker fclose($fp); } + // parse HTTP response + if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $store, $m)) { + $http_status = $m[1]; + if ($http_status != '200') + $this->error = 'HTTP ' . $m[1] . $m[2]; + } + if (!$store) { $this->error = "Empty result from spelling engine"; } + else if (preg_match('/error = "Error code $m[1] returned"; + } preg_match_all('/([^<]*)<\/c>/', $store, $matches, PREG_SET_ORDER); diff --git a/program/steps/utils/spell.inc b/program/steps/utils/spell.inc index a0dd35d27..b59fe7998 100644 --- a/program/steps/utils/spell.inc +++ b/program/steps/utils/spell.inc @@ -42,6 +42,13 @@ else { $result = $spellchecker->get_xml(); } +if ($err = $spellchecker->error()) { + raise_error(array('code' => 500, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => sprintf("Spell check engine error: " . $err)), + true, false); +} + // set response length header("Content-Length: " . strlen($result)); -- cgit v1.2.3