From e8d59fb6cbe4f8ef59afbeecaeec220750eac6da Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 24 May 2013 23:37:22 +0400
Subject: [PATCH] specified proper namespaces

---
 apps/advanced/backstage/config/main.php            |  2 +-
 .../backstage/controllers/SiteController.php       |  2 +-
 apps/advanced/common/models/ContactForm.php        | 63 ----------------------
 apps/advanced/common/models/LoginForm.php          | 58 --------------------
 apps/advanced/common/models/User.php               |  2 +-
 apps/advanced/console/config/main.php              |  2 +-
 apps/advanced/frontend/config/main.php             |  2 +-
 .../frontend/controllers/SiteController.php        |  2 +-
 apps/advanced/frontend/models/ContactForm.php      |  2 +-
 apps/advanced/frontend/models/LoginForm.php        |  2 +-
 apps/advanced/frontend/models/User.php             |  2 +-
 11 files changed, 9 insertions(+), 130 deletions(-)
 delete mode 100644 apps/advanced/common/models/ContactForm.php
 delete mode 100644 apps/advanced/common/models/LoginForm.php

diff --git a/apps/advanced/backstage/config/main.php b/apps/advanced/backstage/config/main.php
index 561dae1..6204f50 100644
--- a/apps/advanced/backstage/config/main.php
+++ b/apps/advanced/backstage/config/main.php
@@ -12,7 +12,7 @@ return array(
 	'id' => 'change-me',
 	'basePath' => dirname(__DIR__),
 	'preload' => array('log'),
-	'controllerNamespace' => 'app\controllers',
+	'controllerNamespace' => 'backstage\controllers',
 	'modules' => array(
 	),
 	'components' => array(
diff --git a/apps/advanced/backstage/controllers/SiteController.php b/apps/advanced/backstage/controllers/SiteController.php
index ff3b8b4..192884b 100644
--- a/apps/advanced/backstage/controllers/SiteController.php
+++ b/apps/advanced/backstage/controllers/SiteController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace backstage\controllers;
 
 use Yii;
 use yii\web\Controller;
diff --git a/apps/advanced/common/models/ContactForm.php b/apps/advanced/common/models/ContactForm.php
deleted file mode 100644
index 7b713a1..0000000
--- a/apps/advanced/common/models/ContactForm.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace app\models;
-
-use yii\base\Model;
-
-/**
- * ContactForm is the model behind the contact form.
- */
-class ContactForm extends Model
-{
-	public $name;
-	public $email;
-	public $subject;
-	public $body;
-	public $verifyCode;
-
-	/**
-	 * @return array the validation rules.
-	 */
-	public function rules()
-	{
-		return array(
-			// name, email, subject and body are required
-			array('name, email, subject, body', 'required'),
-			// email has to be a valid email address
-			array('email', 'email'),
-			// verifyCode needs to be entered correctly
-			array('verifyCode', 'captcha'),
-		);
-	}
-
-	/**
-	 * @return array customized attribute labels
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'verifyCode' => 'Verification Code',
-		);
-	}
-
-	/**
-	 * Sends an email to the specified email address using the information collected by this model.
-	 * @param string $email the target email address
-	 * @return boolean whether the model passes validation
-	 */
-	public function contact($email)
-	{
-		if ($this->validate()) {
-			$name = '=?UTF-8?B?' . base64_encode($this->name) . '?=';
-			$subject = '=?UTF-8?B?' . base64_encode($this->subject) . '?=';
-			$headers = "From: $name <{$this->email}>\r\n" .
-				"Reply-To: {$this->email}\r\n" .
-				"MIME-Version: 1.0\r\n" .
-				"Content-type: text/plain; charset=UTF-8";
-			mail($email, $subject, $this->body, $headers);
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/apps/advanced/common/models/LoginForm.php b/apps/advanced/common/models/LoginForm.php
deleted file mode 100644
index 5ba1dc6..0000000
--- a/apps/advanced/common/models/LoginForm.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace app\models;
-
-use Yii;
-use yii\base\Model;
-
-/**
- * LoginForm is the model behind the login form.
- */
-class LoginForm extends Model
-{
-	public $username;
-	public $password;
-	public $rememberMe = true;
-
-	/**
-	 * @return array the validation rules.
-	 */
-	public function rules()
-	{
-		return array(
-			// username and password are both required
-			array('username, password', 'required'),
-			// password is validated by validatePassword()
-			array('password', 'validatePassword'),
-			// rememberMe must be a boolean value
-			array('rememberMe', 'boolean'),
-		);
-	}
-
-	/**
-	 * Validates the password.
-	 * This method serves as the inline validation for password.
-	 */
-	public function validatePassword()
-	{
-		$user = User::findByUsername($this->username);
-		if (!$user || !$user->validatePassword($this->password)) {
-			$this->addError('password', 'Incorrect username or password.');
-		}
-	}
-
-	/**
-	 * Logs in a user using the provided username and password.
-	 * @return boolean whether the user is logged in successfully
-	 */
-	public function login()
-	{
-		if ($this->validate()) {
-			$user = User::findByUsername($this->username);
-			Yii::$app->user->login($user, $this->rememberMe ? 3600*24*30 : 0);
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php
index afbf9f8..035f1fb 100644
--- a/apps/advanced/common/models/User.php
+++ b/apps/advanced/common/models/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\models;
+namespace common\models;
 
 class User extends \yii\base\Object implements \yii\web\Identity
 {
diff --git a/apps/advanced/console/config/main.php b/apps/advanced/console/config/main.php
index f5e488c..a237444 100644
--- a/apps/advanced/console/config/main.php
+++ b/apps/advanced/console/config/main.php
@@ -12,7 +12,7 @@ return array(
 	'id' => 'change-me',
 	'basePath' => dirname(__DIR__),
 	'preload' => array('log'),
-	'controllerNamespace' => 'app\controllers',
+	'controllerNamespace' => 'console\controllers',
 	'modules' => array(
 	),
 	'components' => array(
diff --git a/apps/advanced/frontend/config/main.php b/apps/advanced/frontend/config/main.php
index 561dae1..eac7c4d 100644
--- a/apps/advanced/frontend/config/main.php
+++ b/apps/advanced/frontend/config/main.php
@@ -12,7 +12,7 @@ return array(
 	'id' => 'change-me',
 	'basePath' => dirname(__DIR__),
 	'preload' => array('log'),
-	'controllerNamespace' => 'app\controllers',
+	'controllerNamespace' => 'frontend\controllers',
 	'modules' => array(
 	),
 	'components' => array(
diff --git a/apps/advanced/frontend/controllers/SiteController.php b/apps/advanced/frontend/controllers/SiteController.php
index ff3b8b4..d2ea5a6 100644
--- a/apps/advanced/frontend/controllers/SiteController.php
+++ b/apps/advanced/frontend/controllers/SiteController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace frontend\controllers;
 
 use Yii;
 use yii\web\Controller;
diff --git a/apps/advanced/frontend/models/ContactForm.php b/apps/advanced/frontend/models/ContactForm.php
index 7b713a1..b3d8682 100644
--- a/apps/advanced/frontend/models/ContactForm.php
+++ b/apps/advanced/frontend/models/ContactForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\models;
+namespace frontend\models;
 
 use yii\base\Model;
 
diff --git a/apps/advanced/frontend/models/LoginForm.php b/apps/advanced/frontend/models/LoginForm.php
index 5ba1dc6..f5e131d 100644
--- a/apps/advanced/frontend/models/LoginForm.php
+++ b/apps/advanced/frontend/models/LoginForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\models;
+namespace frontend\models;
 
 use Yii;
 use yii\base\Model;
diff --git a/apps/advanced/frontend/models/User.php b/apps/advanced/frontend/models/User.php
index afbf9f8..8a60503 100644
--- a/apps/advanced/frontend/models/User.php
+++ b/apps/advanced/frontend/models/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\models;
+namespace frontend\models;
 
 class User extends \yii\base\Object implements \yii\web\Identity
 {