void PopulateItemList(int Socket);
int DispenseItem(int Socket, int ItemID);
int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason);
+ int Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason);
int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason);
+ int Dispense_Donate(int Socket, int Ammount, const char *Reason);
int Dispense_EnumUsers(int Socket);
int Dispense_ShowUser(int Socket, const char *Username);
void _PrintUserLine(const char *Line);
continue;
}
+ //
+ // `dispense acct`
+ // -
if( strcmp(arg, "acct") == 0 )
{
// Connect to server
// argv[i+2]: Ammount
// argv[i+3]: Reason
- // Alter balance
- Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
+ if( argv[i+2][0] == '=' ) {
+ // Set balance
+ if( argv[i+2][1] != '0' && atoi(&argv[i+2][1]) == 0 ) {
+ fprintf(stderr, "Error: Invalid balance to be set\n");
+ exit(1);
+ }
+
+ Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2]+1), argv[i+3]);
+ }
+ else {
+ // Alter balance
+ Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
+ }
}
// Show user information
//
// `dispense give`
// - "Here, have some money."
- else if( strcmp(arg, "give") == 0 )
+ if( strcmp(arg, "give") == 0 )
{
if( i + 3 >= argc ) {
fprintf(stderr, "`dispense give` takes three arguments\n");
}
//
// `dispense user`
- // - User administration (Wheel Only)
- else if( strcmp(arg, "user") == 0 )
+ // - User administration (Admin Only)
+ if( strcmp(arg, "user") == 0 )
{
// Check argument count
if( i + 1 >= argc ) {
}
return 0;
}
+
+ // Donation!
+ if( strcmp(arg, "donate") == 0 )
+ {
+ // Check argument count
+ if( i + 2 >= argc ) {
+ fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+ ShowUsage();
+ exit(1);
+ }
+
+ // Connect to server
+ sock = OpenConnection(gsDispenseServer, giDispensePort);
+ if( sock < 0 ) return -1;
+
+ // Attempt authentication
+ if( Authenticate(sock) )
+ return -1;
+
+ // Do donation
+ Dispense_Donate(sock, atoi(argv[i+1]), argv[i+1]);
+
+ return 0;
+ }
+
else {
// Item name / pattern
gsItemPattern = arg;
}
else
{
+ // Very basic dispense interface
for( i = 0; i < giNumItems; i ++ ) {
printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID,
gaItems[i].Price, gaItems[i].Desc);
{
printf(
"Usage:\n"
+ " == Everyone ==\n"
" dispense\n"
" Show interactive list\n"
" dispense <item>\n"
" Dispense named item\n"
" dispense give <user> <ammount> \"<reason>\"\n"
- " Give some of your money away\n"
+ " Give money to another user\n"
+ " dispense donate <ammount> \"<reason>\"\n"
+ " Donate to the club\n"
+ " == Coke members == \n"
" dispense acct [<user>]\n"
" Show user balances\n"
" dispense acct <user> [+-]<ammount> \"<reason>\"\n"
- " Alter a account value (Coke members only)\n"
+ " Alter a account value\n"
+ " == Dispense administrators ==\n"
+ " dispense acct <user> =<ammount> \"<reason>\"\n"
+ " Set an account balance\n"
" dispense user add <user>\n"
- " Create new coke account (Wheel members only)\n"
- " dispense user type <flags>\n"
+ " Create new coke account (Admins only)\n"
+ " dispense user type <user> <flags>\n"
" Alter a user's flags\n"
- " <flags> is a comma-separated list of user,coke,wheel,disabled\n"
+ " <flags> is a comma-separated list of user, coke, admin or disabled\n"
" Flags are removed by preceding the name with '-' or '!'\n"
"\n"
"General Options:\n"
}
/**
- * \brief Alter a user's balance
+ * \brief Set a user's balance
+ * \note Only avaliable to dispense admins
+ */
+int Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason)
+{
+ char *buf;
+ int responseCode;
+
+ sendf(Socket, "SET %s %i %s\n", Username, Balance, Reason);
+ buf = ReadLine(Socket);
+
+ responseCode = atoi(buf);
+ free(buf);
+
+ switch(responseCode)
+ {
+ case 200: return 0; // OK
+ case 403: // Not in coke
+ fprintf(stderr, "You are not an admin\n");
+ return 1;
+ case 404: // Unknown user
+ fprintf(stderr, "Unknown user '%s'\n", Username);
+ return 2;
+ default:
+ fprintf(stderr, "Unknown response code %i\n", responseCode);
+ return -1;
+ }
+
+ return -1;
+}
+
+/**
+ * \brief Give money to another user
*/
int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason)
{
return -1;
}
+
+/**
+ * \brief Donate money to the club
+ */
+int Dispense_Donate(int Socket, int Ammount, const char *Reason)
+{
+ char *buf;
+ int responseCode;
+
+ if( Ammount < 0 ) {
+ printf("Sorry, you can only give, you can't take.\n");
+ return -1;
+ }
+
+ // Fast return on zero
+ if( Ammount == 0 ) {
+ printf("Are you actually going to give any?\n");
+ return 0;
+ }
+
+ sendf(Socket, "DONATE %i %s\n", Ammount, Reason);
+ buf = ReadLine(Socket);
+
+ responseCode = atoi(buf);
+ free(buf);
+
+ switch(responseCode)
+ {
+ case 200: return 0; // OK
+
+ case 402:
+ fprintf(stderr, "Insufficient balance\n");
+ return 1;
+
+ default:
+ fprintf(stderr, "Unknown response code %i\n", responseCode);
+ return -1;
+ }
+
+ return -1;
+}
+
/**
* \brief Enumerate users
*/
if( giMinimumBalance != INT_MIN ) {
if( giMaximumBalance != INT_MAX ) {
- sendf(Socket, "ENUM_USERS %i %i\n", giMinimumBalance, giMaximumBalance);
+ sendf(Socket, "ENUM_USERS min_balance:%i max_balance:%i\n", giMinimumBalance, giMaximumBalance);
}
else {
- sendf(Socket, "ENUM_USERS %i\n", giMinimumBalance);
+ sendf(Socket, "ENUM_USERS min_balance:%i\n", giMinimumBalance);
}
}
else {
if( giMaximumBalance != INT_MAX ) {
- sendf(Socket, "ENUM_USERS - %i\n", giMaximumBalance);
+ sendf(Socket, "ENUM_USERS max_balance:%i\n", giMaximumBalance);
}
else {
sendf(Socket, "ENUM_USERS\n");
flags[flagsLen] = '\0';
bal = atoi(Line + matches[4].rm_so);
- printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, bal%100, flags);
+ printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, abs(bal)%100, flags);
}
}
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au