From 731cbf8980a339cf75b1dfc8a6658cb832df543c Mon Sep 17 00:00:00 2001 From: resurtm Date: Sat, 25 May 2013 21:40:11 +0600 Subject: [PATCH] New error page WIP. --- apps/bootstrap/controllers/SiteController.php | 4 +- apps/bootstrap/www/tmp/gears.png | Bin 0 -> 4579 bytes apps/bootstrap/www/tmp/main.css | 15 ++++- apps/bootstrap/www/tmp/main.js | 7 +- framework/yii/base/ErrorHandler.php | 16 ++++- framework/yii/views/errorHandler/callStackItem.php | 2 +- framework/yii/views/errorHandler/main.php | 71 +++++++-------------- 7 files changed, 60 insertions(+), 55 deletions(-) create mode 100644 apps/bootstrap/www/tmp/gears.png diff --git a/apps/bootstrap/controllers/SiteController.php b/apps/bootstrap/controllers/SiteController.php index 4652430..a6731f9 100644 --- a/apps/bootstrap/controllers/SiteController.php +++ b/apps/bootstrap/controllers/SiteController.php @@ -20,8 +20,10 @@ class SiteController extends Controller public function actionIndex() { + $x = null; + $x->y = 100; throw new \yii\base\HttpException(500, 'Test exception'); - $x = 1; +// $x = 1; echo $this->render('index'); } diff --git a/apps/bootstrap/www/tmp/gears.png b/apps/bootstrap/www/tmp/gears.png new file mode 100644 index 0000000000000000000000000000000000000000..7eaa41ce13c91790b33d25e0e3aa51425d2e48e9 GIT binary patch literal 4579 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 zSJPyp+Pa#+~{IXrenderFile($this->mainView, array('e' => $exception), $this); + $request = array(); + if (count($_GET) > 0) { + $request[] = '$_GET = ' . var_export($_GET, true) . ';'; + } + if (count($_POST) > 0) { + $request[] = '$_POST = ' . var_export($_POST, true) . ';'; + } + $request[] = '$_SERVER = ' . var_export($_SERVER, true) . ';'; + $request = implode("\n\n", $request); + echo $view->renderFile($this->mainView, array( + 'e' => $exception, + 'request' => $request, + 'requestLinesCount' => substr_count($request, "\n"), + ), $this); } } } diff --git a/framework/yii/views/errorHandler/callStackItem.php b/framework/yii/views/errorHandler/callStackItem.php index e4ac1bf..b319d16 100644 --- a/framework/yii/views/errorHandler/callStackItem.php +++ b/framework/yii/views/errorHandler/callStackItem.php @@ -1,13 +1,13 @@ context; ?> diff --git a/framework/yii/views/errorHandler/main.php b/framework/yii/views/errorHandler/main.php index 4ff8c8d..0ea82e1 100644 --- a/framework/yii/views/errorHandler/main.php +++ b/framework/yii/views/errorHandler/main.php @@ -2,6 +2,8 @@ /** * @var \yii\base\View $this * @var \Exception $e + * @var string $request + * @var integer $requestLinesCount * @var \yii\base\ErrorHandler $c */ $c = $this->context; @@ -27,14 +29,23 @@ $c = $this->context;
- Attention -

- Exception – addTypeLinks(get_class($e)); ?> - - – createHttpStatusLink($e->statusCode); ?> - -

-

htmlEncode($e->getName()); ?>

+ + Gears +

+ htmlEncode($e->getName()); ?> + – addTypeLinks(get_class($e)); ?> +

+

htmlEncode($e->getMessage()); ?>

+ + Attention +

+ Exception – addTypeLinks(get_class($e)); ?> + + – createHttpStatusLink($e->statusCode); ?> + +

+

htmlEncode($e->getName()); ?>

+
@@ -46,49 +57,11 @@ $c = $this->context;
- -
-
-
- 
$_GET = [
-	'show-post' => 100,
-	'refresh-page' => 'yes',
-	'ascending-sort' => 1,
-];
-
-$_POST = [
-	'blog-post-form' => [
-		'title' => 'hello',
-		'author_id' => '12',
-	],
-];
-
-$_SERVER = [
-	'DOCUMENT_ROOT' => '/home/resurtm/work/data',
-	'REMOTE_ADDR' => '::1',
-	'REMOTE_PORT' => '52694',
-	'SERVER_SOFTWARE' => 'PHP 5.4.3 Development Server',
-	'SERVER_PROTOCOL' => 'HTTP/1.1',
-	'SERVER_NAME' => 'localhost',
-	'SERVER_PORT' => '8000',
-	'REQUEST_URI' => '/index.php?post-form[title]=hello&post-form[author_id]=12',
-	'REQUEST_METHOD' => 'GET',
-	'SCRIPT_NAME' => '/index.php',
-	'SCRIPT_FILENAME' => '/home/resurtm/work/data/index.php',
-	'PHP_SELF' => '/index.php',
-	'QUERY_STRING' => 'post-form[title]=hello&post-form[author_id]=12',
-	'HTTP_HOST' => 'localhost:8000',
-	'HTTP_USER_AGENT' => 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:20.0) Gecko/20100101 Firefox/20.0',
-	'HTTP_ACCEPT_LANGUAGE' => 'ru-RU,ru;q=0.8,en-US;q=0.5,en;q=0.3',
-	'HTTP_ACCEPT_ENCODING' => 'gzip, deflate',
-	'HTTP_CONNECTION' => 'keep-alive',
-	'REQUEST_TIME_FLOAT' => 1369146454.0856,
-	'REQUEST_TIME' => 1369146454,
-];
+
+ 
htmlEncode($request); ?>
-
- */ ?> +
Yii Framework