Changeset 776

Timestamp:

04/15/11 11:37:06 (13 months ago)

Author:

r2

Message:

правильные редиректы после авторизаций

Location:

trunk

Files:

• components/registration/frontend.php (modified) (6 diffs)
• install/sqldumpdemo.sql (modified) (2 diffs)
• migrate/index.php (modified) (1 diff)

trunk/components/registration/frontend.php

@@ -223 +223 @@
                     $group_id = $cfg['default_gid'] ? $cfg['default_gid'] : 1;
 
-                    $sql = "INSERT INTO cms_users (group_id, login, nickname, password, email, icq, regdate, logdate, birthdate, is_locked, invited_by)
-                            VALUES ('$group_id', '$login', '$nickname', '$pass', '$email', '$icq', NOW(), NOW(), '$birthdate', '$is_locked', '{$invited_by}')";
+                    $sql = "INSERT INTO cms_users (group_id, login, nickname, password, email, icq, regdate, logdate, birthdate, is_locked, is_logged_once, invited_by)
+                            VALUES ('$group_id', '$login', '$nickname', '$pass', '$email', '$icq', NOW(), NOW(), '$birthdate', '$is_locked', 0, '{$invited_by}')";
                     $inDB->query($sql) ;
 
@@ -326 +326 @@
             $back = '/admin/';
         } else {
-            $back = ($_SERVER['HTTP_REFERER'] == 'http://'.$_SERVER['HTTP_HOST'].'/login') ? '/' : $inCore->getBackURL();
+            $back = $inCore->getBackURL();
         }
 
@@ -353 +353 @@
         if( !$inCore->inRequest('logout') ) {
 
-                if (isset($_SESSION['auth_back_url'])){
-                    $back = $_SESSION['auth_back_url'];
-                    $is_sess_back = true;
-                    unset($_SESSION['auth_back_url']);
-                } else {
-                    $is_sess_back = false;
-                }
-
                 if ($inCore->inRequest('login')) { $login = $inCore->request('login', 'str'); }
                 if ($inCore->inRequest('pass')) { $passw = $inCore->request('pass', 'str'); }
 
                 if (!$login && !$passw){
-                                        if ($is_sess_back) {
-                    $_SESSION['auth_back_url'] = $back;
-                                        }
+
+                    $_SESSION['back_url'] = $inCore->getBackURL();
 
                     $inPage->setTitle($_LANG['SITE_LOGIN']);
@@ -374 +365 @@
                     $smarty = $inCore->initSmarty('components', 'com_registration_login.tpl');
                     $smarty->assign('cfg', $cfg);
-                    $smarty->assign('is_sess_back', $is_sess_back);
+                    $smarty->assign('is_sess_back', isset($_SESSION['auth_back_url']));
                     $smarty->display('com_registration_login.tpl');
                     return;
+
                 }
 
@@ -413 +405 @@
                     $inUser->dropStatTimer();
 
-                    //cmsUser::updateStats($user['id']);
-
-                    $first_time_auth = ($user['logdate']=='0000-00-00 00:00:00' || intval($user['logdate']==0));
-
-                    $inDB->query("UPDATE cms_users SET logdate = NOW(), last_ip = '$current_ip' WHERE id = ".$user['id']) ;
+                    $first_time_auth = !$user['is_logged_once'];
+
+                    $inDB->query("UPDATE cms_users SET logdate = NOW(), last_ip = '$current_ip', is_logged_once = 1 WHERE id = ".$user['id']) ;
 
                     $cfg = $inCore->loadComponentConfig('registration');
@@ -423 +413 @@
                     if (!isset($cfg['first_auth_redirect']))    {  $cfg['first_auth_redirect'] = 'profile';    }
 
-                    if (!$inCore->userIsAdmin($user['id']) && !$is_sess_back){
-                        if ($first_time_auth) { $cfg['auth_redirect'] = $cfg['first_auth_redirect']; }
-                        switch($cfg['auth_redirect']){
-                            case 'none': $url = $back; break;
-                            case 'index': $url = '/'; break;
-                            case 'profile': $url = cmsUser::getProfileURL($user['login']); break;
-                            case 'editprofile': $url = '/users/'.$user['id'].'/editprofile.html'; break;
+                    if ($_SESSION['auth_back_url']){
+                        $back = $_SESSION['auth_back_url'];
+                        $is_sess_back = true;
+                        unset($_SESSION['auth_back_url']);
+                    } else {
+                        $is_sess_back = false;
+                        $back = $inCore->getBackURL();
+                    }
+
+                    if (!$inCore->userIsAdmin($user['id'])){
+                        if (!$is_sess_back){
+                            if ($first_time_auth) { $cfg['auth_redirect'] = $cfg['first_auth_redirect']; }
+                            switch($cfg['auth_redirect']){
+                                case 'none': $url = $back; break;
+                                case 'index': $url = '/'; break;
+                                case 'profile': $url = cmsUser::getProfileURL($user['login']); break;
+                                case 'editprofile': $url = '/users/'.$user['id'].'/editprofile.html'; break;
+                            }
+                        } else {
+                            $url = $back;
                         }
-                    } else { $url = $back; }
+                    } else { 
+                        $url = isset($_SESSION['back_url']) ? $_SESSION['back_url'] : '/';
+                        if (isset($_SESSION['back_url'])) unset($_SESSION['back_url']);
+                    }
 
                     //Ðåäèðåêòèì íàçàä

trunk/install/sqldumpdemo.sql

@@ -1437 +1437 @@
   `is_locked` int(11) NOT NULL,
   `is_deleted` int(11) NOT NULL,
+  `is_logged_once` tinyint(4) NOT NULL DEFAULT '0',
   `rating` int(11) NOT NULL,
   `points` int(11) NOT NULL,
@@ -1448 +1449 @@
 ) ENGINE=MyISAM  DEFAULT CHARSET=cp1251 ROW_FORMAT=DYNAMIC;
 
-INSERT INTO `#__users` (`id`, `group_id`, `login`, `nickname`, `password`, `email`, `icq`, `regdate`, `logdate`, `birthdate`, `is_locked`, `is_deleted`, `rating`, `points`, `last_ip`, `status`, `status_date`, `invited_by`, `invdate`) VALUES
-(1, 2, 'admin', 'Àäìèíèñòðàòîð', '2ca41752ccf4dbdb76d8fe88c488fd44', 'admin@cms.ru', '100200300', '2007-11-23 12:41:57', '2010-11-14 15:24:30', '1980-10-23', 0, 0, 32, 0, '127.0.0.1', 'Ñàìûé äëèííûé ñòàòóñ èç âñåõ ÷òî ñóùåñòâóþò â ýòîì ïðåêðàñíîì ìèðå', '2010-10-21 02:06:53', 0, '2010-11-09 23:25:59'),
-(2, 1, 'vasya', 'Âàñèëèé', '2ca41752ccf4dbdb76d8fe88c488fd44', 'vasya@cms.ru', '100200300', '2008-07-16 16:31:48', '2010-11-14 14:32:47', '1980-01-01', 0, 0, 5, 0, '127.0.0.1', 'I love InstantCMS', '2010-11-13 23:09:34', 0, '2010-11-02 13:50:04'),
-(3, 1, 'fedor', 'Ôåäîð', '2ca41752ccf4dbdb76d8fe88c488fd44', 'fedor@cms.com', '100334564', '2010-10-20 17:33:42', '2010-11-13 23:22:26', '1979-10-20', 0, 0, 0, 0, '127.0.0.1', 'We are all made of stars (c) Moby', '2010-10-28 15:44:45', NULL, NULL);
+INSERT INTO `#__users` (`id`, `group_id`, `login`, `nickname`, `password`, `email`, `icq`, `regdate`, `logdate`, `birthdate`, `is_locked`, `is_deleted`, `is_logged_once`, `rating`, `points`, `last_ip`, `status`, `status_date`, `invited_by`, `invdate`) VALUES
+(1, 2, 'admin', 'Àäìèíèñòðàòîð', '2ca41752ccf4dbdb76d8fe88c488fd44', 'admin@cms.ru', '100200300', '2007-11-23 12:41:57', '2011-04-15 13:20:33', '1980-10-23', 0, 0, 0, 32, 0, '127.0.0.1', 'Ñàìûé äëèííûé ñòàòóñ èç âñåõ ÷òî ñóùåñòâóþò â ýòîì ïðåêðàñíîì ìèðå', '2010-10-21 02:06:53', 0, '2010-11-09 23:25:59'),
+(2, 1, 'vasya', 'Âàñèëèé', '2ca41752ccf4dbdb76d8fe88c488fd44', 'vasya@cms.ru', '100200300', '2008-07-16 16:31:48', '2011-04-15 12:36:58', '1980-01-01', 0, 0, 0, 5, 0, '127.0.0.1', 'I love InstantCMS', '2010-11-13 23:09:34', 0, '2010-11-02 13:50:04'),
+(3, 1, 'fedor', 'Ôåäîð', '2ca41752ccf4dbdb76d8fe88c488fd44', 'fedor@cms.com', '100334564', '2010-10-20 17:33:42', '2010-11-13 23:22:26', '1979-10-20', 0, 0, 0, 0, 0, '127.0.0.1', 'We are all made of stars (c) Moby', '2010-10-28 15:44:45', NULL, NULL);
 
 DROP TABLE IF EXISTS `#__users_activate`;

trunk/migrate/index.php

@@ -209 +209 @@
     }
 
+    if (!$inDB->isFieldExists('cms_users', 'is_logged_once')){
+        $inDB->query("ALTER TABLE `cms_users` ADD `is_logged_once` TINYINT NOT NULL DEFAULT '1' AFTER `is_deleted`");
+        $is_was_migrate = true;
+    }
+
 // ========================================================================== //
 // ========================================================================== //