cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update for version 1.0.2

Browse Source
This commit is contained in:
sujitprasad
2015-11-30 16:38:59 +05:30
parent d0a69a8df1
commit 7e17edab1e
425 changed files with 14241 additions and 3410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
code/app/Exceptions/Handler.php
View File

@@ -46,49 +46,49 @@ class Handler extends ExceptionHandler {
*/
public function render($request, Exception $e)
{
if ($this->isHttpException($e) && $e->getStatusCode() == 404) {
return response()->view('errors.404', []);
} else {
if(\Config::get('database.install') == 1) {
// if(\Config::get('app.ErrorLog') == '%1%') {
// \App\Http\Controllers\Common\SettingsController::smtp();
// \Mail::send('errors.report', array('e' => $e), function ($message) {
// $message->to('', '')->subject('');
// });
// }
}
return response()->view('errors.500', []);
}
return parent::render($request, $e);
// if ($this->isHttpException($e) && $e->getStatusCode() == 404) {
// return response()->view('errors.404', []);
// } else {
// if(\Config::get('database.install') == 1) {
// // if(\Config::get('app.ErrorLog') == '%1%') {
// // \App\Http\Controllers\Common\SettingsController::smtp();
// // \Mail::send('errors.report', array('e' => $e), function ($message) {
// // $message->to('', '')->subject('');
// // });
// // }
// }
// return response()->view('errors.500', []);
// }
// return parent::render($request, $e);
// if ($this->isHttpException($e))
// {
// return $this->renderHttpException($e);
// }
if ($this->isHttpException($e))
{
return $this->renderHttpException($e);
}
// if (config('app.debug'))
// {
// return $this->renderExceptionWithWhoops($e);
// }
if (config('app.debug'))
{
return $this->renderExceptionWithWhoops($e);
}
// return parent::render($request, $e);
return parent::render($request, $e);
}
// protected function renderExceptionWithWhoops(Exception $e)
// {
// $whoops = new \Whoops\Run;
// $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler());
protected function renderExceptionWithWhoops(Exception $e)
{
$whoops = new \Whoops\Run;
$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler());
// return new \Illuminate\Http\Response(
// $whoops->handleException($e),
// $e->getStatusCode(),
// $e->getHeaders()
// );
// }
return new \Illuminate\Http\Response(
$whoops->handleException($e),
$e->getStatusCode(),
$e->getHeaders()
);
}
}