diff --git a/index.php b/index.php index 6954bbf3..95572351 100644 --- a/index.php +++ b/index.php @@ -167,7 +167,14 @@ try { $bridge->setDatas($params); } catch(Exception $e){ $title = urlencode($bridge->getName() . ' failed with error ' . $e->getCode()); - $body = urlencode('Error message: ' . $e->getmessage()); + + // Build a GitHub compatible message + $body = urlencode('Error message: `' + . $e->getmessage() + . "`\nQuery string: `" + . $_SERVER['QUERY_STRING'] . '`' + ); + $link = 'https://github.com/rss-bridge/rss-bridge/issues/new?title=' . $title . '&body=' @@ -177,20 +184,25 @@ try { . $bridge->getMaintainer(); $message = <<getName()} was unable to receive or process the remote website's content. -Check your input parameters or press F5 to retry. - -Use the following link to notify the bridge maintainer if this error persists: -$link - -Additional info: - -Error code: "{$e->getCode()}" -Message: "{$e->getMessage()}" + + + + {$e->getCode()} - {$e->getMessage()} + + +

Error {$e->getCode()} - {$e->getMessage()}

+

{$bridge->getName()} was unable to receive or process the remote website's content! +
Check your input parameters or press F5 to retry. +
Use this link to notify the bridge maintainer if this error persists.

+

Additional info

+

Error code: "{$e->getCode()}"

+

Message: "{$e->getMessage()}"

+ + EOD; header('HTTP/1.1 ' . $e->getCode() . ' ' . Http::getMessageForCode($e->getCode())); - header('Content-Type: text/plain'); + header('Content-Type: text/html'); die($message); } @@ -202,7 +214,14 @@ EOD; $format->display(); } catch(Exception $e){ $title = urlencode($bridge->getName() . ' failed with error ' . $e->getCode()); - $body = urlencode('Error message: ' . $e->getmessage()); + + // Build a GitHub compatible message + $body = urlencode('Error message: `' + . $e->getmessage() + . "`\nQuery string: `" + . $_SERVER['QUERY_STRING'] . '`' + ); + $link = 'https://github.com/rss-bridge/rss-bridge/issues/new?title=' . $title . '&body=' @@ -212,20 +231,25 @@ EOD; . $bridge->getMaintainer(); $message = <<getName()}! -Check your input parameters or press F5 to retry. - -Use the following link to notify the bridge maintainer if this error persists: -$link - -Additional info: - -Error code: "{$e->getCode()}" -Message: "{$e->getMessage()}" + + + + {$e->getCode()} - {$e->getMessage()} + + +

Error {$e->getCode()} - {$e->getMessage()}

+

RSS-Bridge was unable to transform the contents returned by {$bridge->getName()}! +
Check your input parameters or press F5 to retry. +
Use this link to notify the bridge maintainer if this error persists.

+

Additional info

+

Error code: "{$e->getCode()}"

+

Message: "{$e->getMessage()}"

+ + EOD; header('HTTP/1.1 ' . $e->getCode() . ' ' . Http::getMessageForCode($e->getCode())); - header('Content-Type: text/plain'); + header('Content-Type: text/html'); die($message); }