From bc21de98bd60039874db5ae1237bca6e246b9c3a Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 10 Aug 2013 07:33:24 -0400
Subject: [PATCH] Refactored the basic app.

---
 apps/basic/config/web.php                  |  6 +-
 apps/basic/controllers/SiteController.php  |  5 +-
 apps/basic/views/site/about.php            | 13 ++--
 apps/basic/views/site/contact.php          | 56 ++++++++-------
 apps/basic/views/site/error.php            | 29 ++++++++
 apps/basic/views/site/index.php            | 82 +++++++++++-----------
 apps/basic/views/site/login.php            | 26 +++----
 apps/basic/web/index.php                   |  2 +-
 framework/yii/YiiBase.php                  |  2 +-
 framework/yii/views/errorHandler/error.php | 28 ++++++--
 10 files changed, 156 insertions(+), 93 deletions(-)
 create mode 100644 apps/basic/views/site/error.php

diff --git a/apps/basic/config/web.php b/apps/basic/config/web.php
index 16bc5a1df1..7622bc3729 100644
--- a/apps/basic/config/web.php
+++ b/apps/basic/config/web.php
@@ -7,7 +7,7 @@ return array(
 	'modules' => array(
 		'debug' => array(
 			'class' => 'yii\debug\Module',
-			'enabled' => YII_DEBUG && YII_ENV_DEV,
+			'enabled' => YII_ENV_DEV,
 		),
 	),
 	'components' => array(
@@ -15,9 +15,11 @@ return array(
 			'class' => 'yii\caching\FileCache',
 		),
 		'user' => array(
-			'class' => 'yii\web\User',
 			'identityClass' => 'app\models\User',
 		),
+		'errorHandler' => array(
+			'errorAction' => 'site/error',
+		),
 		'log' => array(
 			'traceLevel' => YII_DEBUG ? 3 : 0,
 			'targets' => array(
diff --git a/apps/basic/controllers/SiteController.php b/apps/basic/controllers/SiteController.php
index 04da8b3ac5..0c73873e50 100644
--- a/apps/basic/controllers/SiteController.php
+++ b/apps/basic/controllers/SiteController.php
@@ -12,9 +12,12 @@ class SiteController extends Controller
 	public function actions()
 	{
 		return array(
+			'error' => array(
+				'class' => 'yii\web\ErrorAction',
+			),
 			'captcha' => array(
 				'class' => 'yii\captcha\CaptchaAction',
-				'fixedVerifyCode' => YII_ENV_DEV ? 'testme' : null,
+				'fixedVerifyCode' => YII_ENV_TEST ? 'testme' : null,
 			),
 		);
 	}
diff --git a/apps/basic/views/site/about.php b/apps/basic/views/site/about.php
index 5766d5520e..967b8fe6ee 100644
--- a/apps/basic/views/site/about.php
+++ b/apps/basic/views/site/about.php
@@ -7,11 +7,12 @@ use yii\helpers\Html;
 $this->title = 'About';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<h1><?php echo Html::encode($this->title); ?></h1>
+<div class="site-about">
+	<h1><?php echo Html::encode($this->title); ?></h1>
 
-<p>
-	This is the About page. You may modify the following file to customize its content:
-</p>
-
-<code><?php echo __FILE__; ?></code>
+	<p>
+		This is the About page. You may modify the following file to customize its content:
+	</p>
 
+	<code><?php echo __FILE__; ?></code>
+</div>
diff --git a/apps/basic/views/site/contact.php b/apps/basic/views/site/contact.php
index 2183bd3f34..eb6e0f59c5 100644
--- a/apps/basic/views/site/contact.php
+++ b/apps/basic/views/site/contact.php
@@ -11,32 +11,38 @@ use yii\captcha\Captcha;
 $this->title = 'Contact';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<h1><?php echo Html::encode($this->title); ?></h1>
+<div class="site-contact">
+	<h1><?php echo Html::encode($this->title); ?></h1>
 
-<?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
-<div class="alert alert-success">
-	Thank you for contacting us. We will respond to you as soon as possible.
-</div>
-<?php return; endif; ?>
+	<?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
 
-<p>
-	If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
-</p>
-
-<div class="row">
-	<div class="col-lg-5">
-		<?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?>
-			<?php echo $form->field($model, 'name')->textInput(); ?>
-			<?php echo $form->field($model, 'email')->textInput(); ?>
-			<?php echo $form->field($model, 'subject')->textInput(); ?>
-			<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
-			<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array(
-				'options' => array('class' => 'form-control'),
-				'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
-			)); ?>
-			<div class="form-actions">
-				<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?>
-			</div>
-		<?php ActiveForm::end(); ?>
+	<div class="alert alert-success">
+		Thank you for contacting us. We will respond to you as soon as possible.
 	</div>
+
+	<?php else: ?>
+
+	<p>
+		If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
+	</p>
+
+	<div class="row">
+		<div class="col-lg-5">
+			<?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?>
+				<?php echo $form->field($model, 'name')->textInput(); ?>
+				<?php echo $form->field($model, 'email')->textInput(); ?>
+				<?php echo $form->field($model, 'subject')->textInput(); ?>
+				<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
+				<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array(
+					'options' => array('class' => 'form-control'),
+					'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
+				)); ?>
+				<div class="form-actions">
+					<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?>
+				</div>
+			<?php ActiveForm::end(); ?>
+		</div>
+	</div>
+
+	<?php endif; ?>
 </div>
diff --git a/apps/basic/views/site/error.php b/apps/basic/views/site/error.php
new file mode 100644
index 0000000000..024e27d4da
--- /dev/null
+++ b/apps/basic/views/site/error.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Html;
+
+/**
+ * @var yii\base\View $this
+ * @var string $name
+ * @var string $message
+ * @var Exception $exception
+ */
+
+$this->title = $name;
+?>
+<div class="site-error">
+
+	<h1><?php echo Html::encode($this->title); ?></h1>
+
+	<div class="alert alert-danger">
+		<?php echo nl2br(Html::encode($message)); ?>
+	</div>
+
+	<p>
+		The above error occurred while the Web server was processing your request.
+	</p>
+	<p>
+		Please contact us if you think this is a server error. Thank you.
+	</p>
+
+</div>
diff --git a/apps/basic/views/site/index.php b/apps/basic/views/site/index.php
index 7e86eb6fd3..bc084da5b3 100644
--- a/apps/basic/views/site/index.php
+++ b/apps/basic/views/site/index.php
@@ -2,50 +2,52 @@
 /**
  * @var yii\base\View $this
  */
-$this->title = 'Welcome';
+$this->title = 'My Yii Application';
 ?>
-<div class="jumbotron">
-	<h1>Congratulations!</h1>
+<div class="site-index">
 
-	<p class="lead">You have successfully created your Yii-powered application.</p>
+	<div class="jumbotron">
+		<h1>Congratulations!</h1>
 
-	<p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
-</div>
+		<p class="lead">You have successfully created your Yii-powered application.</p>
 
-<div class="body-content">
-
-	<div class="row">
-		<div class="col-lg-4">
-			<h2>Heading</h2>
-
-			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-				dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-				ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-				fugiat nulla pariatur.</p>
-
-			<p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
-		</div>
-		<div class="col-lg-4">
-			<h2>Heading</h2>
-
-			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-				dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-				ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-				fugiat nulla pariatur.</p>
-
-			<p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
-		</div>
-		<div class="col-lg-4">
-			<h2>Heading</h2>
-
-			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-				dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-				ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-				fugiat nulla pariatur.</p>
-
-			<p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
-		</div>
+		<p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
 	</div>
 
-</div>
+	<div class="body-content">
 
+		<div class="row">
+			<div class="col-lg-4">
+				<h2>Heading</h2>
+
+				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+					dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
+					ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+					fugiat nulla pariatur.</p>
+
+				<p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
+			</div>
+			<div class="col-lg-4">
+				<h2>Heading</h2>
+
+				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+					dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
+					ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+					fugiat nulla pariatur.</p>
+
+				<p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
+			</div>
+			<div class="col-lg-4">
+				<h2>Heading</h2>
+
+				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+					dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
+					ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+					fugiat nulla pariatur.</p>
+
+				<p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
+			</div>
+		</div>
+
+	</div>
+</div>
diff --git a/apps/basic/views/site/login.php b/apps/basic/views/site/login.php
index efe47e0994..15ec52b47e 100644
--- a/apps/basic/views/site/login.php
+++ b/apps/basic/views/site/login.php
@@ -10,19 +10,21 @@ use yii\widgets\ActiveForm;
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<h1><?php echo Html::encode($this->title); ?></h1>
+<div class="site-login">
+	<h1><?php echo Html::encode($this->title); ?></h1>
 
-<p>Please fill out the following fields to login:</p>
+	<p>Please fill out the following fields to login:</p>
 
-<div class="row">
-	<div class="col-lg-3">
-		<?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
-			<?php echo $form->field($model, 'username')->textInput(); ?>
-			<?php echo $form->field($model, 'password')->passwordInput(); ?>
-			<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
-			<div class="form-actions">
-				<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
-			</div>
-		<?php ActiveForm::end(); ?>
+	<div class="row">
+		<div class="col-lg-3">
+			<?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
+				<?php echo $form->field($model, 'username')->textInput(); ?>
+				<?php echo $form->field($model, 'password')->passwordInput(); ?>
+				<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
+				<div class="form-actions">
+					<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
+				</div>
+			<?php ActiveForm::end(); ?>
+		</div>
 	</div>
 </div>
diff --git a/apps/basic/web/index.php b/apps/basic/web/index.php
index fb66386fed..e4b0cc9c77 100644
--- a/apps/basic/web/index.php
+++ b/apps/basic/web/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// comment out the following line to disable debug mode
+// comment out the following two lines when deployed to production
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'dev');
 
diff --git a/framework/yii/YiiBase.php b/framework/yii/YiiBase.php
index 2f03bba51f..4d94b5f60e 100644
--- a/framework/yii/YiiBase.php
+++ b/framework/yii/YiiBase.php
@@ -567,7 +567,7 @@ class YiiBase
 	 */
 	public static function powered()
 	{
-		return 'Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a>.';
+		return 'Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a>';
 	}
 
 	/**
diff --git a/framework/yii/views/errorHandler/error.php b/framework/yii/views/errorHandler/error.php
index c9afaf51a9..8f2e50983e 100644
--- a/framework/yii/views/errorHandler/error.php
+++ b/framework/yii/views/errorHandler/error.php
@@ -3,14 +3,32 @@
  * @var \Exception $exception
  * @var \yii\base\ErrorHandler $handler
  */
-$title = $handler->htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName() : get_class($exception));
+if ($exception instanceof \yii\web\HttpException) {
+	$code = $exception->statusCode;
+} else {
+	$code = $exception->getCode();
+}
+if ($exception instanceof \yii\base\Exception) {
+	$name = $exception->getName();
+} else {
+	$name = 'Error';
+}
+if ($code) {
+	$name .= " (#$code)";
+}
+
+if ($exception instanceof \yii\base\UserException) {
+	$message = $exception->getMessage();
+} else {
+	$message = 'An internal server error occurred.';
+}
 ?>
 <?php if (method_exists($this, 'beginPage')) $this->beginPage(); ?>
 <!DOCTYPE html>
 <html>
 <head>
 	<meta charset="utf-8" />
-	<title><?php echo $title?></title>
+	<title><?php echo $handler->htmlEncode($name); ?></title>
 
 	<style>
 		body {
@@ -51,8 +69,8 @@ $title = $handler->htmlEncode($exception instanceof \yii\base\Exception ? $excep
 </head>
 
 <body>
-	<h1><?php echo $title?></h1>
-	<h2><?php echo nl2br($handler->htmlEncode($exception->getMessage()))?></h2>
+	<h1><?php echo $handler->htmlEncode($name); ?></h1>
+	<h2><?php echo nl2br($handler->htmlEncode($message)); ?></h2>
 	<p>
 		The above error occurred while the Web server was processing your request.
 	</p>
@@ -60,7 +78,7 @@ $title = $handler->htmlEncode($exception instanceof \yii\base\Exception ? $excep
 		Please contact us if you think this is a server error. Thank you.
 	</p>
 	<div class="version">
-		<?php echo date('Y-m-d H:i:s', time())?>
+		<?php echo date('Y-m-d H:i:s', time()); ?>
 	</div>
 	<?php if (method_exists($this, 'endBody')) $this->endBody(); // to allow injecting code into body (mostly by Yii Debug Toolbar) ?>
 </body>