added varius components for supporting user website.

[ga4php.git] / authserver / authd / authd.php

diff --git a/authserver/authd/authd.php b/authserver/authd/authd.php
index 3a52041..67036a7 100644 (file)
--- a/authserver/authd/authd.php
+++ b/authserver/authd/authd.php
@@ -48,29 +48,51 @@ if($pid == -1) {
                                $authval = $myga->authenticateUser($username, $passcode);
                                msg_send($cl_queue, MSG_AUTH_USER_TOKEN, $authval);
                                break;
-                               
-                       case MSG_GET_OTK_PNG:
+                       case MSG_GET_OTK_ID:
                                if(!isset($msg["username"])) {
-                                       msg_send($cl_queue, MSG_GET_OTK_PNG, false);
+                                       msg_send($cl_queue, MSG_GET_OTK_ID, false);
                                } else {
                                        $username = $msg["username"];
                                        $sql = "select users_otk from users where users_username='$username'";
                                        $dbo = getDatabase();
                                        $res = $dbo->query($sql);
-                                       $otk = "";
+                                       $otkid = "";
+                                       foreach($res as $row) {
+                                               $otkid = $row["users_otk"];
+                                       }
+                                       
+                                       if($otkid == "") {
+                                               msg_send($cl_queue, MSG_GET_OTK_ID, false);
+                                       } else {
+                                               msg_send($cl_queue, MSG_GET_OTK_ID, $otkid);
+                                       }
+                               }
+                               break;
+                       case MSG_GET_OTK_PNG:
+                               if(!isset($msg["otk"])) {
+                                       msg_send($cl_queue, MSG_GET_OTK_PNG, false);
+                               } else {
+                                       $otk = $msg["otk"];
+                                       $sql = "select users_username from users where users_otk='$otk'";
+                                       $dbo = getDatabase();
+                                       $res = $dbo->query($sql);
+                                       $username = "";
                                        foreach($res as $row) {
-                                               $otk = $row["users_otk"];
+                                               $username = $row["users_username"];
                                        }
                                        
-                                       if($otk == "") {
+                                       if($username == "") {
+                                               msg_send($cl_queue, MSG_GET_OTK_PNG, false);
+                                       } else if($username != $msg["username"]) {
                                                msg_send($cl_queue, MSG_GET_OTK_PNG, false);
                                        } else {
                                                $hand = fopen("otks/$otk.png", "rb");
                                                $data = fread($hand, filesize("otks/$otk.png"));
                                                fclose($hand);
-                                               unlink("otks/$otk.png");
-                                               $sql = "update users set users_otk='' where users_username='$username'";
-                                               $dbo->query($sql);
+                                               //unlink("otks/$otk.png");
+                                               //$sql = "update users set users_otk='' where users_username='$username'";
+                                               //$dbo->query($sql);
+                                               error_log("senting otk, fsize: ".filesize("otks/$otk.png")." $otk ");
                                                msg_send($cl_queue, MSG_GET_OTK_PNG, $data);
                                        }
                                }