Changeset 7609

Timestamp:

Jun 18, 2008, 6:25:42 PM (13 years ago)

Author:

ogawa

Message:

#1502:スレーブPNEで使われるdb_member_create_member()でc_member_idを返すようにした、またINSERT失敗時に不要なデータを削除する処理を加えた

Location:

OpenPNE/branches/stable-2.12.x/webapp

Files:

• lib/db/member.php (modified) (3 diffs)
• modules/ktai/do/o_login.php (modified) (1 diff)
• modules/pc/do/o_login.php (modified) (1 diff)

OpenPNE/branches/stable-2.12.x/webapp/lib/db/member.php

@@ -1900 +1900 @@
     );
     $c_member_id = db_insert('c_member', $data);
+    if (!$c_member_id) {
+        return false;
+    }
 
     $data = array(
@@ -1910 +1913 @@
         'easy_access_id' => '',
     );
-
     if (!IS_SLAVEPNE_EMAIL_REGIST) {
         $data['pc_address'] = t_encrypt($c_member_id.'@pc.example.com');
         $data['ktai_address'] = t_encrypt($c_member_id.'@ktai.example.com');
     }
-
-    db_insert('c_member_secure', $data);
+    if (!db_insert('c_member_secure', $data)) {
+        $sql = 'DELETE FROM c_member WHERE c_member_id = ?';
+        db_query($sql, array($c_member_id));
+
+        return false;
+    }
 
     $data = array(
@@ -1922 +1928 @@
         'username' => $username,
     );
-    db_insert('c_username', $data);
+    if (!db_insert('c_username', $data)) {
+        $sql = 'DELETE FROM c_member WHERE c_member_id = ?';
+        db_query($sql, array($c_member_id));
+
+        $sql = 'DELETE FROM c_member_secure WHERE c_member_id = ?';
+        db_query($sql, array($c_member_id));
+
+        return false;
+    }
+
+    return $c_member_id;
 }
 

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

@@ -55 +55 @@
 
         $c_member_id = db_member_c_member_id4username_encrypted($auth->getUsername(), true);
+        if (OPENPNE_AUTH_MODE == 'slavepne' && !$c_member_id) {
+            $c_member_id = db_member_create_member($_POST['username']);
+        }
         if (!$c_member_id) {
-            if (OPENPNE_AUTH_MODE == 'slavepne') {
-                db_member_create_member($_POST['username']);
-            } else {
-                $p = array('msg' => '0', 'kad' => t_encrypt($ktai_address), 'login_params' => $requests['login_params']);
-                openpne_redirect('ktai', 'page_o_login', $p);
-            }
+            $p = array('msg' => '0', 'kad' => t_encrypt($ktai_address), 'login_params' => $requests['login_params']);
+            openpne_redirect('ktai', 'page_o_login', $p);
         }
 

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

@@ -47 +47 @@
 
         $c_member_id = db_member_c_member_id4username_encrypted($auth->getUsername(), false);
+        if (OPENPNE_AUTH_MODE == 'slavepne' && !$c_member_id) {
+            $c_member_id = db_member_create_member($_POST['username']);
+        }
         if (!$c_member_id) {
-            if (OPENPNE_AUTH_MODE == 'slavepne') {
-                db_member_create_member($_POST['username']);
-            } else {
-                $this->_fail_login();
-            }
+            $this->_fail_login();
         }