Перенос экшенов Login и Registration в экшен Auth

2024-04-28 23:19:21 +03:00 · 2015-02-18 15:04:34 +07:00 · 2015-02-18 15:04:34 +07:00 · d41d588700
parent e4aa9ee08f
commit d41d588700
23 changed files with 522 additions and 26 deletions
--- a/application/classes/actions/ActionAuth.class.php
+++ b/application/classes/actions/ActionAuth.class.php
@ -0,0 +1,499 @@
+<?php
+/*
+ * LiveStreet CMS
+ * Copyright © 2013 OOO "ЛС-СОФТ"
+ *
+ * ------------------------------------------------------
+ *
+ * Official site: www.livestreetcms.com
+ * Contact e-mail: office@livestreetcms.com
+ *
+ * GNU General Public License, version 2:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * ------------------------------------------------------
+ *
+ * @link http://www.livestreetcms.com
+ * @copyright 2013 OOO "ЛС-СОФТ"
+ * @author Maxim Mzhelskiy <rus.engine@gmail.com>
+ *
+ */
+
+/**
+ * Обрабатывает авторизацию/регистрацию
+ *
+ * @package application.actions
+ * @since 1.0
+ */
+class ActionAuth extends Action
+{
+    /**
+     * Инициализация
+     *
+     */
+    public function Init()
+    {
+        /**
+         * Устанавливаем дефолтный евент
+         */
+        $this->SetDefaultEvent('login');
+        /**
+         * Отключаем отображение статистики выполнения
+         */
+        Router::SetIsShowStats(false);
+    }
+
+    /**
+     * Регистрируем евенты
+     *
+     */
+    protected function RegisterEvent()
+    {
+        $this->AddEvent('login', 'EventLogin');
+        $this->AddEvent('logout', 'EventLogout');
+        $this->AddEvent('password-reset', 'EventPasswordReset');
+        $this->AddEvent('register', 'EventRegister');
+        $this->AddEvent('register-confirm', 'EventRegisterConfirm');
+        $this->AddEvent('activate', 'EventActivate');
+        $this->AddEvent('reactivation', 'EventReactivation');
+
+        $this->AddEvent('ajax-login', 'EventAjaxLogin');
+        $this->AddEvent('ajax-password-reset', 'EventAjaxPasswordReset');
+        $this->AddEvent('ajax-validate-fields', 'EventAjaxValidateFields');
+        $this->AddEvent('ajax-register', 'EventAjaxRegister');
+        $this->AddEvent('ajax-reactivation', 'EventAjaxReactivation');
+    }
+
+    /**
+     * Ajax авторизация
+     */
+    protected function EventAjaxLogin()
+    {
+        /**
+         * Устанвливаем формат Ajax ответа
+         */
+        $this->Viewer_SetResponseAjax('json');
+        /**
+         * Логин и пароль являются строками?
+         */
+        if (!is_string(getRequest('login')) or !is_string(getRequest('password'))) {
+            $this->Message_AddErrorSingle($this->Lang_Get('system_error'));
+            return;
+        }
+        /**
+         * Проверяем есть ли такой юзер по логину
+         */
+        if ((func_check(getRequest('login'),
+                    'mail') and $oUser = $this->User_GetUserByMail(getRequest('login'))) or $oUser = $this->User_GetUserByLogin(getRequest('login'))
+        ) {
+            /**
+             *  Выбираем сценарий валидации
+             */
+            $oUser->_setValidateScenario('signIn');
+            /**
+             * Заполняем поля (данные)
+             */
+            $oUser->setCaptcha(getRequestStr('captcha'));
+            /**
+             * Запускаем валидацию
+             */
+            if ($oUser->_Validate()) {
+                /**
+                 * Сверяем хеши паролей и проверяем активен ли юзер
+                 */
+
+                if ($oUser->getPassword() == func_encrypt(getRequest('password'))) {
+                    if (!$oUser->getActivate()) {
+                        $this->Message_AddErrorSingle($this->Lang_Get('auth.login.notices.error_not_activated',
+                            array('reactivation_path' => Router::GetPath('auth/reactivation'))));
+                        return;
+                    }
+                    $bRemember = getRequest('remember', false) ? true : false;
+                    /**
+                     * Убиваем каптчу
+                     */
+                    unset($_SESSION['captcha_keystring_user_auth']);
+                    /**
+                     * Авторизуем
+                     */
+                    $this->User_Authorization($oUser, $bRemember);
+                    /**
+                     * Определяем редирект
+                     */
+                    $sUrl = Config::Get('module.user.redirect_after_login');
+                    if (getRequestStr('return-path')) {
+                        $sUrl = getRequestStr('return-path');
+                    }
+                    $this->Viewer_AssignAjax('sUrlRedirect', $sUrl ? $sUrl : Router::GetPath('/'));
+                    return;
+                }
+            } else {
+                /**
+                 * Получаем ошибки
+                 */
+                $this->Viewer_AssignAjax('aErrors', $oUser->_getValidateErrors());
+            }
+        }
+        $this->Message_AddErrorSingle($this->Lang_Get('auth.login.notices.error_login'));
+    }
+
+    /**
+     * Обрабатываем процесс залогинивания
+     * По факту только отображение шаблона, дальше вступает в дело Ajax
+     *
+     */
+    protected function EventLogin()
+    {
+        /**
+         * Если уже авторизирован
+         */
+        if ($this->User_GetUserCurrent()) {
+            Router::Location(Router::GetPath('/'));
+        }
+        $this->Viewer_AddHtmlTitle($this->Lang_Get('auth.login.title'));
+    }
+
+    /**
+     * Обрабатываем процесс разлогинивания
+     *
+     */
+    protected function EventLogout()
+    {
+        $this->Security_ValidateSendForm();
+        $this->User_Logout();
+        Router::LocationAction('/');
+    }
+
+    /**
+     * Ajax запрос на восстановление пароля
+     */
+    protected function EventAjaxPasswordReset()
+    {
+        /**
+         * Устанвливаем формат Ajax ответа
+         */
+        $this->Viewer_SetResponseAjax('json');
+        /**
+         * Пользователь с таким емайлом существует?
+         */
+        if ((func_check(getRequestStr('mail'), 'mail') and $oUser = $this->User_GetUserByMail(getRequestStr('mail')))) {
+            /**
+             * Формируем и отправляем ссылку на смену пароля
+             */
+            $oReminder = Engine::GetEntity('User_Reminder');
+            $oReminder->setCode(func_generator(32));
+            $oReminder->setDateAdd(date("Y-m-d H:i:s"));
+            $oReminder->setDateExpire(date("Y-m-d H:i:s", time() + 60 * 60 * 24 * 7));
+            $oReminder->setDateUsed(null);
+            $oReminder->setIsUsed(0);
+            $oReminder->setUserId($oUser->getId());
+            if ($this->User_AddReminder($oReminder)) {
+                $this->Message_AddNotice($this->Lang_Get('auth.reset.notices.success_send_link'));
+                $this->Notify_SendReminderCode($oUser, $oReminder);
+                return;
+            }
+        }
+        $this->Message_AddError($this->Lang_Get('auth.notices.error_bad_email'), $this->Lang_Get('error'));
+    }
+
+    /**
+     * Обработка напоминания пароля, подтверждение смены пароля
+     *
+     */
+    protected function EventPasswordReset()
+    {
+        $this->SetTemplateAction('reset');
+        /**
+         * Устанавливаем title страницы
+         */
+        $this->Viewer_AddHtmlTitle($this->Lang_Get('auth.reset.title'));
+        /**
+         * Проверка кода на восстановление пароля и генерация нового пароля
+         */
+        if (func_check($this->GetParam(0), 'md5')) {
+            /**
+             * Проверка кода подтверждения
+             */
+            if ($oReminder = $this->User_GetReminderByCode($this->GetParam(0))) {
+                if (!$oReminder->getIsUsed() and strtotime($oReminder->getDateExpire()) > time() and $oUser = $this->User_GetUserById($oReminder->getUserId())) {
+                    $sNewPassword = func_generator(7);
+                    $oUser->setPassword(func_encrypt($sNewPassword));
+                    if ($this->User_Update($oUser)) {
+                        $oReminder->setDateUsed(date("Y-m-d H:i:s"));
+                        $oReminder->setIsUsed(1);
+                        $this->User_UpdateReminder($oReminder);
+                        $this->Notify_SendReminderPassword($oUser, $sNewPassword);
+                        $this->SetTemplateAction('reset_confirm');
+                        return;
+                    }
+                }
+            }
+            $this->Message_AddErrorSingle($this->Lang_Get('auth.reset.alerts.error_bad_code'),
+                $this->Lang_Get('error'));
+            return Router::Action('error');
+        }
+    }
+
+
+    /**
+     * Ajax валидация форму регистрации
+     */
+    protected function EventAjaxValidateFields()
+    {
+        /**
+         * Устанавливаем формат Ajax ответа
+         */
+        $this->Viewer_SetResponseAjax('json');
+        /**
+         * Создаем объект пользователя и устанавливаем сценарий валидации
+         */
+        $oUser = Engine::GetEntity('ModuleUser_EntityUser');
+        $oUser->_setValidateScenario('registration');
+        /**
+         * Пробегаем по переданным полям/значениям и валидируем их каждое в отдельности
+         */
+        $aFields = getRequest('fields');
+        if (is_array($aFields)) {
+            foreach ($aFields as $aField) {
+                if (isset($aField['field']) and isset($aField['value'])) {
+                    $this->Hook_Run('registration_validate_field', array('aField' => &$aField, 'oUser' => $oUser));
+
+                    $sField = $aField['field'];
+                    $sValue = $aField['value'];
+                    /**
+                     * Список полей для валидации
+                     */
+                    switch ($sField) {
+                        case 'login':
+                            $oUser->setLogin($sValue);
+                            break;
+                        case 'mail':
+                            $oUser->setMail($sValue);
+                            break;
+                        case 'captcha':
+                            $oUser->setCaptcha($sValue);
+                            break;
+                        case 'password':
+                            $oUser->setPassword($sValue);
+                            break;
+                        case 'password_confirm':
+                            $oUser->setPasswordConfirm($sValue);
+                            $oUser->setPassword(isset($aField['params']['password']) ? $aField['params']['password'] : null);
+                            break;
+                        default:
+                            continue;
+                            break;
+                    }
+                    /**
+                     * Валидируем поле
+                     */
+                    $oUser->_Validate(array($sField), false);
+                }
+            }
+        }
+        /**
+         * Возникли ошибки?
+         */
+        if ($oUser->_hasValidateErrors()) {
+            /**
+             * Получаем ошибки
+             */
+            $this->Viewer_AssignAjax('aErrors', $oUser->_getValidateErrors());
+        }
+    }
+
+    /**
+     * Обработка Ajax регистрации
+     */
+    protected function EventAjaxRegister()
+    {
+        /**
+         * Устанавливаем формат Ajax ответа
+         */
+        $this->Viewer_SetResponseAjax('json');
+        /**
+         * Создаем объект пользователя и устанавливаем сценарий валидации
+         */
+        $oUser = Engine::GetEntity('ModuleUser_EntityUser');
+        $oUser->_setValidateScenario('registration');
+        /**
+         * Заполняем поля (данные)
+         */
+        $oUser->setLogin(getRequestStr('login'));
+        $oUser->setMail(getRequestStr('mail'));
+        $oUser->setPassword(getRequestStr('password'));
+        $oUser->setPasswordConfirm(getRequestStr('password_confirm'));
+        $oUser->setCaptcha(getRequestStr('captcha'));
+        $oUser->setDateRegister(date("Y-m-d H:i:s"));
+        $oUser->setIpRegister(func_getIp());
+        /**
+         * Если используется активация, то генерим код активации
+         */
+        if (Config::Get('general.reg.activation')) {
+            $oUser->setActivate(0);
+            $oUser->setActivateKey(md5(func_generator() . time()));
+        } else {
+            $oUser->setActivate(1);
+            $oUser->setActivateKey(null);
+        }
+        $this->Hook_Run('registration_validate_before', array('oUser' => $oUser));
+        /**
+         * Запускаем валидацию
+         */
+        if ($oUser->_Validate()) {
+            $this->Hook_Run('registration_validate_after', array('oUser' => $oUser));
+            $oUser->setPassword(func_encrypt($oUser->getPassword()));
+            if ($this->User_Add($oUser)) {
+                $this->Hook_Run('registration_after', array('oUser' => $oUser));
+                /**
+                 * Убиваем каптчу
+                 */
+                unset($_SESSION['captcha_keystring_user_signup']);
+                /**
+                 * Подписываем пользователя на дефолтные события в ленте активности
+                 */
+                $this->Stream_switchUserEventDefaultTypes($oUser->getId());
+                /**
+                 * Если стоит регистрация с активацией то проводим её
+                 */
+                if (Config::Get('general.reg.activation')) {
+                    /**
+                     * Отправляем на мыло письмо о подтверждении регистрации
+                     */
+                    $this->Notify_SendRegistrationActivate($oUser, getRequestStr('password'));
+                    $this->Viewer_AssignAjax('sUrlRedirect', Router::GetPath('auth/register-confirm'));
+                } else {
+                    $this->Notify_SendRegistration($oUser, getRequestStr('password'));
+                    $oUser = $this->User_GetUserById($oUser->getId());
+                    /**
+                     * Сразу авторизуем
+                     */
+                    $this->User_Authorization($oUser, false);
+                    /**
+                     * Определяем URL для редиректа после авторизации
+                     */
+                    $sUrl = Config::Get('module.user.redirect_after_registration');
+                    if (getRequestStr('return-path')) {
+                        $sUrl = getRequestStr('return-path');
+                    }
+                    $this->Viewer_AssignAjax('sUrlRedirect', $sUrl ? $sUrl : Router::GetPath('/'));
+                    $this->Message_AddNoticeSingle($this->Lang_Get('auth.registration.notices.success'));
+                }
+            } else {
+                $this->Message_AddErrorSingle($this->Lang_Get('system_error'));
+                return;
+            }
+        } else {
+            /**
+             * Получаем ошибки
+             */
+            $this->Viewer_AssignAjax('aErrors', $oUser->_getValidateErrors());
+        }
+    }
+
+    /**
+     * Показывает страничку регистрации
+     * Просто вывод шаблона
+     */
+    protected function EventRegister()
+    {
+
+    }
+
+    /**
+     * Обрабатывает активацию аккаунта
+     */
+    protected function EventActivate()
+    {
+        $bError = false;
+        /**
+         * Проверяет передан ли код активации
+         */
+        $sActivateKey = $this->GetParam(0);
+        if (!func_check($sActivateKey, 'md5')) {
+            $bError = true;
+        }
+        /**
+         * Проверяет верный ли код активации
+         */
+        if (!($oUser = $this->User_GetUserByActivateKey($sActivateKey))) {
+            $bError = true;
+        }
+        /**
+         *
+         */
+        if ($oUser and $oUser->getActivate()) {
+            $this->Message_AddErrorSingle($this->Lang_Get('auth.registration.notices.error_reactivate'),
+                $this->Lang_Get('error'));
+            return Router::Action('error');
+        }
+        /**
+         * Если что то не то
+         */
+        if ($bError) {
+            $this->Message_AddErrorSingle($this->Lang_Get('auth.registration.notices.error_code'),
+                $this->Lang_Get('error'));
+            return Router::Action('error');
+        }
+        /**
+         * Активируем
+         */
+        $oUser->setActivate(1);
+        $oUser->setDateActivate(date("Y-m-d H:i:s"));
+        /**
+         * Сохраняем юзера
+         */
+        if ($this->User_Update($oUser)) {
+            $this->User_Authorization($oUser, false);
+            return;
+        } else {
+            $this->Message_AddErrorSingle($this->Lang_Get('system_error'));
+            return Router::Action('error');
+        }
+    }
+
+    /**
+     * Повторный запрос активации
+     */
+    protected function EventReactivation()
+    {
+        if ($this->User_GetUserCurrent()) {
+            Router::Location(Router::GetPath('/'));
+        }
+
+        $this->Viewer_AddHtmlTitle($this->Lang_Get('auth.reactivation.title'));
+    }
+
+    /**
+     *  Ajax повторной активации
+     */
+    protected function EventAjaxReactivation()
+    {
+        $this->Viewer_SetResponseAjax('json');
+
+        if ((func_check(getRequestStr('mail'), 'mail') and $oUser = $this->User_GetUserByMail(getRequestStr('mail')))) {
+            if ($oUser->getActivate()) {
+                $this->Message_AddErrorSingle($this->Lang_Get('auth.registration.notices.error_reactivate'));
+                return;
+            } else {
+                $oUser->setActivateKey(md5(func_generator() . time()));
+                if ($this->User_Update($oUser)) {
+                    $this->Message_AddNotice($this->Lang_Get('auth.reactivation.notices.success'));
+                    $this->Notify_SendReactivationCode($oUser);
+                    return;
+                }
+            }
+        }
+
+        $this->Message_AddErrorSingle($this->Lang_Get('auth.notices.error_bad_email'));
+    }
+
+    /**
+     * Просто выводит шаблон для подтверждения регистрации
+     *
+     */
+    protected function EventRegisterConfirm()
+    {
+        $this->SetTemplateAction('confirm');
+    }
+}
--- a/application/classes/hooks/HookMain.class.php
+++ b/application/classes/hooks/HookMain.class.php
@ -45,7 +45,7 @@ class HookMain extends Hook
         */
        $oUserCurrent = $this->User_GetUserCurrent();
        if (!$oUserCurrent and Config::Get('general.close') and !Router::CheckIsCurrentAction((array)Config::Get('general.close_exceptions'))) {
-            Router::Action('login');
+            Router::Action('auth/login');
        }
        $this->LoadDefaultJsVar();
        /**
--- a/application/config/config.php
+++ b/application/config/config.php
@ -70,8 +70,7 @@ $config['block']['tags']['personal_tags_count'] = 70;         // сколько
 */
 $config['general']['close'] = false; // использовать закрытый режим работы сайта, сайт будет доступен только авторизованным пользователям
 $config['general']['close_exceptions'] = array(
-    'registration',
-    'login',
+    'auth',
    'ajax' => array('captcha'),
 ); // список action/avent для исключения при закрытом режиме
 $config['general']['rss_editor_mail'] = '___sys.mail.from_email___'; // мыло редактора РСС
@ -369,11 +368,10 @@ $config['router']['uri'] = array(
 );
 // Распределение action
 $config['router']['page']['error'] = 'ActionError';
-$config['router']['page']['registration'] = 'ActionRegistration';
+$config['router']['page']['auth'] = 'ActionAuth';
 $config['router']['page']['profile'] = 'ActionProfile';
 $config['router']['page']['blog'] = 'ActionBlog';
 $config['router']['page']['index'] = 'ActionIndex';
-$config['router']['page']['login'] = 'ActionLogin';
 $config['router']['page']['people'] = 'ActionPeople';
 $config['router']['page']['settings'] = 'ActionSettings';
 $config['router']['page']['tag'] = 'ActionTag';
--- a/application/frontend/components/auth/auth.invite.tpl
+++ b/application/frontend/components/auth/auth.invite.tpl
@ -2,7 +2,7 @@
 * Форма регистрации через инвайт
 *}

-<form action="{router page='registration'}invite/" method="post">
+<form action="{router page='auth'}invite/" method="post">
    {component 'field' template='text'
        name  = 'invite_code'
        rules = [ 'required' => true, 'type' => 'alphanum' ]
--- a/application/frontend/components/auth/auth.login.tpl
+++ b/application/frontend/components/auth/auth.login.tpl
@ -8,7 +8,7 @@

 {hook run='login_begin'}

-<form action="{router page='login'}" method="post" class="js-auth-login-form">
+<form action="{router page='auth/login'}" method="post" class="js-auth-login-form">
    {hook run='form_login_begin'}

    {* Логин *}
@ -49,8 +49,8 @@

 {if $smarty.local.showExtra}
    <div class="pt-20">
-        <a href="{router page='registration'}">{$aLang.auth.registration.title}</a><br />
-        <a href="{router page='login'}reset/">{$aLang.auth.reset.title}</a>
+        <a href="{router page='auth/register'}">{$aLang.auth.registration.title}</a><br />
+        <a href="{router page='auth/password-reset'}">{$aLang.auth.reset.title}</a>
    </div>
 {/if}

--- a/application/frontend/components/auth/auth.reactivation.tpl
+++ b/application/frontend/components/auth/auth.reactivation.tpl
@ -2,7 +2,7 @@
 * Форма запроса повторной активации аккаунта
 *}

-<form action="{router page='registration'}reactivation/" method="post" class="js-form-reactivation">
+<form action="{router page='auth'}reactivation/" method="post" class="js-form-reactivation">
    {* E-mail *}
    {component 'field' template='email' label=$aLang.auth.reactivation.form.fields.mail.label}

--- a/application/frontend/components/auth/auth.registration.tpl
+++ b/application/frontend/components/auth/auth.registration.tpl
@ -8,17 +8,17 @@

 {hook run='registration_begin'}

-<form action="{router page='registration'}" method="post" class="js-auth-registration-form">
+<form action="{router page='auth/register'}" method="post" class="js-auth-registration-form">
    {hook run='form_registration_begin'}

    {* Логин *}
    {component 'field' template='text'
        name   = 'login'
-        rules  = [ 'required' => true, 'rangelength' => '[2,20]', 'remote' => "{router page='registration'}ajax-validate-fields", 'remote-method' => 'POST' ]
+        rules  = [ 'required' => true, 'rangelength' => '[2,20]', 'remote' => "{router page='auth'}ajax-validate-fields", 'remote-method' => 'POST' ]
        label  = $aLang.auth.labels.login}

    {* E-mail *}
-    {component 'field' template='email' rules=[ 'remote' => "{router page='registration'}ajax-validate-fields", 'remote-method' => 'POST' ]}
+    {component 'field' template='email' rules=[ 'remote' => "{router page='auth'}ajax-validate-fields", 'remote-method' => 'POST' ]}

    {* Пароль *}
    {component 'field' template='text'
--- a/application/frontend/components/auth/auth.reset.tpl
+++ b/application/frontend/components/auth/auth.reset.tpl
@ -2,7 +2,7 @@
 * Форма восстановления пароля
 *}

-<form action="{router page='login'}reminder/" method="post" class="js-auth-reset-form">
+<form action="{router page='auth'}password-reset/" method="post" class="js-auth-reset-form">
    {* E-mail *}
    {component 'field' template='email' label=$aLang.auth.reset.form.fields.mail.label}

--- a/application/frontend/components/user/js/user.js
+++ b/application/frontend/components/user/js/user.js
@ -23,7 +23,7 @@ ls.user = (function ($) {

 		/* Авторизация */
 		$('.js-auth-login-form').on('submit', function (e) {
-			ls.ajax.submit(aRouter.login + 'ajax-login', $(this), function ( response ) {
+			ls.ajax.submit(aRouter.auth + 'ajax-login', $(this), function ( response ) {
 				response.sUrlRedirect && (window.location = response.sUrlRedirect);
 			});

@ -32,7 +32,7 @@ ls.user = (function ($) {

 		/* Регистрация */
 		$('.js-auth-registration-form').on('submit', function (e) {
-			ls.ajax.submit(aRouter.registration + 'ajax-registration', $(this), function ( response ) {
+			ls.ajax.submit(aRouter.auth + 'ajax-register', $(this), function ( response ) {
 				response.sUrlRedirect && (window.location = response.sUrlRedirect);
 			});

@ -41,7 +41,7 @@ ls.user = (function ($) {

 		/* Восстановление пароля */
 		$('.js-auth-reset-form').on('submit', function (e) {
-			ls.ajax.submit(aRouter.login + 'ajax-reset', $(this), function ( response ) {
+			ls.ajax.submit(aRouter.auth + 'ajax-password-reset', $(this), function ( response ) {
 				response.sUrlRedirect && (window.location = response.sUrlRedirect);
 			});

@ -49,7 +49,7 @@ ls.user = (function ($) {
 		});

 		/* Повторный запрос на ссылку активации */
-		ls.ajax.form(aRouter.login + 'ajax-reactivation', '.js-form-reactivation', function (result, status, xhr, form) {
+		ls.ajax.form(aRouter.auth + 'ajax-reactivation', '.js-form-reactivation', function (result, status, xhr, form) {
            form.find('input').val('');
            ls.hook.run('ls_user_reactivation_after', [form, result]);
 		});
@ -91,4 +91,4 @@ ls.user = (function ($) {
 	};

 	return this;
-}).call(ls.user || {}, jQuery);
+}).call(ls.user || {}, jQuery);
--- a/application/frontend/skin/developer/actions/ActionRegistration/activate.tpl
+++ b/application/frontend/skin/developer/actions/ActionRegistration/activate.tpl
--- a/application/frontend/skin/developer/actions/ActionRegistration/confirm.tpl
+++ b/application/frontend/skin/developer/actions/ActionRegistration/confirm.tpl
--- a/application/frontend/skin/developer/actions/ActionRegistration/invite.tpl
+++ b/application/frontend/skin/developer/actions/ActionRegistration/invite.tpl
--- a/application/frontend/skin/developer/actions/ActionLogin/index.tpl
+++ b/application/frontend/skin/developer/actions/ActionLogin/index.tpl
--- a/application/frontend/skin/developer/actions/ActionRegistration/reactivation.tpl
+++ b/application/frontend/skin/developer/actions/ActionRegistration/reactivation.tpl
--- a/application/frontend/skin/developer/actions/ActionRegistration/index.tpl
+++ b/application/frontend/skin/developer/actions/ActionRegistration/index.tpl
--- a/application/frontend/skin/developer/actions/ActionLogin/reset.tpl
+++ b/application/frontend/skin/developer/actions/ActionLogin/reset.tpl
--- a/application/frontend/skin/developer/actions/ActionLogin/reset_confirm.tpl
+++ b/application/frontend/skin/developer/actions/ActionLogin/reset_confirm.tpl
--- a/application/frontend/skin/developer/emails/email.invite.tpl
+++ b/application/frontend/skin/developer/emails/email.invite.tpl
@ -11,6 +11,6 @@
 		'website_url'  => Router::GetPath('/'),
 		'website_name' => Config::Get('view.name'),
 		'invite_code'  => $oInvite->getCode(),
-		'login_url'    => {router page='login'}
+		'login_url'    => {router page='auth/login'}
 	]}
 {/block}
--- a/application/frontend/skin/developer/emails/email.reactivation.tpl
+++ b/application/frontend/skin/developer/emails/email.reactivation.tpl
@ -8,6 +8,6 @@
 	{lang name='emails.reactivation.text' params=[
 		'website_url'    => Router::GetPath('/'),
 		'website_name'   => Config::Get('view.name'),
-		'activation_url' => "{router page='registration'}activate/{$oUser->getActivateKey()}/"
+		'activation_url' => "{router page='auth'}activate/{$oUser->getActivateKey()}/"
 	]}
 {/block}
--- a/application/frontend/skin/developer/emails/email.registration_activate.tpl
+++ b/application/frontend/skin/developer/emails/email.registration_activate.tpl
@ -10,6 +10,6 @@
 		'website_name'   => Config::Get('view.name'),
 		'user_name'      => $oUser->getLogin(),
 		'user_password'  => $sPassword,
-		'activation_url' => "{router page='registration'}activate/{$oUser->getActivateKey()}/"
+		'activation_url' => "{router page='auth'}activate/{$oUser->getActivateKey()}/"
 	]}
 {/block}
--- a/application/frontend/skin/developer/emails/email.reminder_code.tpl
+++ b/application/frontend/skin/developer/emails/email.reminder_code.tpl
@ -8,6 +8,6 @@
 	{lang name='emails.reminder_code.text' params=[
 		'website_url'  => Router::GetPath('/'),
 		'website_name' => Config::Get('view.name'),
-		'recover_url'  => "{router page='login'}reset/{$oReminder->getCode()}/"
+		'recover_url'  => "{router page='auth'}password-reset/{$oReminder->getCode()}/"
 	]}
 {/block}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f740a351decc8cdf23efaf89912af3d23143eb4b
+Subproject commit ed7c209f3ef42c774040ad57936c09412688addd
--- a/robots.txt
+++ b/robots.txt
@ -1,6 +1,5 @@
 User-agent: *
-Disallow: /login/
-Disallow: /registration/
+Disallow: /auth/
 Disallow: /rss
 Disallow: /search/
 Disallow: /stream