Changeset 6866

Timestamp:

Apr 30, 2008, 8:29:38 PM (14 years ago)

Author:

ebihara

Message:

#1506:ktai_do_o_loginがログイン後に別モジュールへリダイレクトすることを考慮していなかったのを修正

Location:

OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/do

Files:

• o_easy_login.php (modified) (1 diff)
• o_login.php (modified) (1 diff)

OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/do/o_easy_login.php

@@ -62 +62 @@
         db_member_do_access($c_member_id);
 
+        // ログイン後のリダイレクト先を決定する
+        $a = '';
+        $m = 'ktai';
         $p = array();
+
+        if ($GLOBALS['__Framework']['default_page']) {
+            $a = 'page_' . $GLOBALS['__Framework']['default_page'];
+        }
+
         if ($requests['login_params']) {
             parse_str($requests['login_params'], $p);
         }
-        $p['ksid'] = session_id();
+
         if (!empty($p['a']) && $p['a'] != 'page_o_login') {
             $a = $p['a'];
-            unset($p['a']);
-        } else {
-            $a = 'page_h_home';
         }
-        openpne_redirect('ktai', $a, $p);
+        if (!empty($p['m'])) {
+            $m = $p['m'];
+        }
+
+        $_SESSION['c_member_id'] = $c_member_id;
+        $p['ksid'] = session_id();
+
+        openpne_redirect($m, $a, $p);
     }
 }

OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/do/o_login.php

@@ -66 +66 @@
         db_member_do_access($c_member_id);
 
+        // ログイン後のリダイレクト先を決定する
+        $a = '';
+        $m = 'ktai';
         $p = array();
+
+        if ($GLOBALS['__Framework']['default_page']) {
+            $a = 'page_' . $GLOBALS['__Framework']['default_page'];
+        }
+
         if ($requests['login_params']) {
             parse_str($requests['login_params'], $p);
         }
-        $p['ksid'] = session_id();
+
         if (!empty($p['a']) && $p['a'] != 'page_o_login') {
             $a = $p['a'];
-            unset($p['a']);
-        } else {
-            $a = 'page_h_home';
         }
-        openpne_redirect('ktai', $a, $p);
+        if (!empty($p['m'])) {
+            $m = $p['m'];
+        }
+
+        $_SESSION['c_member_id'] = $c_member_id;
+        $p['ksid'] = session_id();
+
+        openpne_redirect($m, $a, $p);
     }
 }