mirror of
https://github.com/elyby/accounts.git
synced 2025-05-31 14:11:46 +05:30
Базовые модели перенесены в отдельное простраинство имён
Поправлены именования классов (хз, почему оно прежде работало)
This commit is contained in:
@@ -1,10 +1,11 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
|
||||
use api\models\base\ApiForm;
|
||||
use common\models\Account;
|
||||
use Yii;
|
||||
|
||||
class ChangePasswordForm extends BaseApiForm {
|
||||
class ChangePasswordForm extends ApiForm {
|
||||
|
||||
public $password;
|
||||
|
||||
|
@@ -1,11 +1,12 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
|
||||
use api\models\base\PasswordProtectedForm;
|
||||
use common\models\Account;
|
||||
use Yii;
|
||||
use yii\helpers\ArrayHelper;
|
||||
|
||||
class ChangeUsernameForm extends BasePasswordProtectedForm {
|
||||
class ChangeUsernameForm extends PasswordProtectedForm {
|
||||
|
||||
public $username;
|
||||
|
||||
|
@@ -1,12 +1,13 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
|
||||
use api\models\base\KeyConfirmationForm;
|
||||
use common\models\Account;
|
||||
use common\models\EmailActivation;
|
||||
use Yii;
|
||||
use yii\base\ErrorException;
|
||||
|
||||
class ConfirmEmailForm extends BaseKeyConfirmationForm {
|
||||
class ConfirmEmailForm extends KeyConfirmationForm {
|
||||
|
||||
public function confirm() {
|
||||
if (!$this->validate()) {
|
||||
|
@@ -1,10 +1,11 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
|
||||
use api\models\base\ApiForm;
|
||||
use common\models\Account;
|
||||
use Yii;
|
||||
|
||||
class LoginForm extends BaseApiForm {
|
||||
class LoginForm extends ApiForm {
|
||||
|
||||
public $login;
|
||||
public $password;
|
||||
|
@@ -2,6 +2,7 @@
|
||||
namespace api\models;
|
||||
|
||||
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
|
||||
use api\models\base\ApiForm;
|
||||
use common\components\UserFriendlyRandomKey;
|
||||
use common\models\Account;
|
||||
use common\models\EmailActivation;
|
||||
@@ -9,7 +10,7 @@ use Ramsey\Uuid\Uuid;
|
||||
use Yii;
|
||||
use yii\base\ErrorException;
|
||||
|
||||
class RegistrationForm extends BaseApiForm {
|
||||
class RegistrationForm extends ApiForm {
|
||||
|
||||
public $username;
|
||||
public $email;
|
||||
|
@@ -1,13 +1,14 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
|
||||
use api\models\base\ApiForm;
|
||||
use common\components\UserFriendlyRandomKey;
|
||||
use common\models\Account;
|
||||
use common\models\EmailActivation;
|
||||
use Yii;
|
||||
use yii\base\ErrorException;
|
||||
|
||||
class RepeatAccountActivationForm extends BaseApiForm {
|
||||
class RepeatAccountActivationForm extends ApiForm {
|
||||
|
||||
// Частота повтора отправки нового письма
|
||||
const REPEAT_FREQUENCY = 5 * 60;
|
||||
|
@@ -1,9 +1,9 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
namespace api\models\base;
|
||||
|
||||
use yii\base\Model;
|
||||
|
||||
class BaseApiForm extends Model {
|
||||
class ApiForm extends Model {
|
||||
|
||||
public function formName() {
|
||||
return '';
|
@@ -1,9 +1,9 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
namespace api\models\base;
|
||||
|
||||
use common\models\EmailActivation;
|
||||
|
||||
class BaseKeyConfirmationForm extends BaseApiForm {
|
||||
class KeyConfirmationForm extends ApiForm {
|
||||
|
||||
public $key;
|
||||
|
@@ -1,9 +1,9 @@
|
||||
<?php
|
||||
namespace api\models;
|
||||
namespace api\models\base;
|
||||
|
||||
use Yii;
|
||||
|
||||
class BasePasswordProtectedForm extends BaseApiForm {
|
||||
class PasswordProtectedForm extends ApiForm {
|
||||
|
||||
public $password;
|
||||
|
Reference in New Issue
Block a user