Added coke group check to ADD

[tpg/opendispense2.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index 16c4d29..9cdee83 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -22,7 +22,7 @@
 #define HACK_TPG_NOAUTH        1
 #define HACK_ROOT_NOAUTH       1
 
-#define        DEBUG_TRACE_CLIENT      1
+#define        DEBUG_TRACE_CLIENT      0
 
 // Statistics
 #define MAX_CONNECTION_QUEUE   5
@@ -64,6 +64,7 @@ void  Server_Cmd_GIVE(tClient *Client, char *Args);
 void   Server_Cmd_ADD(tClient *Client, char *Args);
 void   Server_Cmd_ENUMUSERS(tClient *Client, char *Args);
 void   Server_Cmd_USERINFO(tClient *Client, char *Args);
+void   _SendUserInfo(tClient *Client, int UserID);
 // --- Helpers ---
  int   sendf(int Socket, const char *Format, ...);
  int   GetUserAuth(const char *Salt, const char *Username, const uint8_t *Hash);
@@ -515,7 +516,7 @@ void Server_Cmd_GIVE(tClient *Client, char *Args)
        // Get recipient
        uid = GetUserID(recipient);
        if( uid == -1 ) {
-               sendf(Client->Socket, "404 Invalid target user");
+               sendf(Client->Socket, "404 Invalid target user\n");
                return ;
        }
 
@@ -570,11 +571,15 @@ void Server_Cmd_ADD(tClient *Client, char *Args)
        reason ++;
 
        // TODO: Check if the current user is in coke/higher
+       if( (GetFlags(Client->UID) & USER_FLAG_TYPEMASK) < USER_TYPE_COKE ) {
+               sendf(Client->Socket, "403 Not in coke\n");
+               return ;
+       }
 
        // Get recipient
        uid = GetUserID(user);
        if( uid == -1 ) {
-               sendf(Client->Socket, "404 Invalid user");
+               sendf(Client->Socket, "404 Invalid user\n");
                return ;
        }
 
@@ -635,7 +640,7 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
                if( bal > maxBal )      continue;
                
                // TODO: User flags
-               sendf(Client->Socket, "202 User %s %i user\n", GetUserName(i), GetBalance(i));
+               _SendUserInfo(Client, i);
        }
        
        sendf(Client->Socket, "200 List End\n");
@@ -656,9 +661,33 @@ void Server_Cmd_USERINFO(tClient *Client, char *Args)
                sendf(Client->Socket, "404 Invalid user");
                return ;
        }
+       
+       _SendUserInfo(Client, uid);
+}
 
+void _SendUserInfo(tClient *Client, int UserID)
+{
+       char    *type, *disabled="";
+        int    flags = GetFlags(UserID);
+       
+       switch( flags & USER_FLAG_TYPEMASK )
+       {
+       default:
+       case USER_TYPE_NORMAL:  type = "user";  break;
+       case USER_TYPE_COKE:    type = "coke";  break;
+       case USER_TYPE_WHEEL:   type = "wheel"; break;
+       case USER_TYPE_GOD:     type = "meta";  break;
+       }
+       
+       if( flags & USER_FLAG_DISABLED )
+               disabled = ",disabled";
+       
        // TODO: User flags/type
-       sendf(Client->Socket, "202 User %s %i user\n", user, GetBalance(uid));
+       sendf(
+               Client->Socket, "202 User %s %i %s%s\n",
+               GetUserName(UserID), GetBalance(UserID),
+               type, disabled
+               );
 }
 
 /**