X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=7dc94993e14d4005a3ca64fd0874250a6331460b;hb=fa66545f293ca97248dc38fb5b712731d56f2430;hp=80b160fb020ab2433d363fc12ae6355b5f7636ca;hpb=fa32b1c7ddbe1740122f61d55b997f639e927e62;p=tpg%2Fopendispense2.git

diff --git a/src/client/main.c b/src/client/main.c
index 80b160f..7dc9499 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -30,6 +30,7 @@
 #define USE_AUTOAUTH	1
 
 #define MAX_TXT_ARGS	5	// Maximum number of textual arguments (including command)
+#define DISPENSE_MULTIPLE_MAX	20	// Maximum argument to -c
 
 enum eUI_Modes
 {
@@ -40,6 +41,18 @@ enum eUI_Modes
 	NUM_UI_MODES
 };
 
+enum eReturnValues
+{
+	RV_SUCCESS,
+	RV_BAD_ITEM,
+	RV_INVALID_USER,
+	RV_PERMISSIONS,
+	RV_ARGUMENTS,
+	RV_BALANCE,
+	RV_UNKNOWN_ERROR = -1,
+	RV_SOCKET_ERROR = -2
+};
+
 // === TYPES ===
 typedef struct sItem {
 	char	*Type;
@@ -66,6 +79,7 @@ void	PopulateItemList(int Socket);
  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_Refund(int Socket, const char *Username, const char *Item, int PriceOverride);
  int	Dispense_Donate(int Socket, int Ammount, const char *Reason);
  int	Dispense_EnumUsers(int Socket);
  int	Dispense_ShowUser(int Socket, const char *Username);
@@ -97,6 +111,7 @@ char	*gsEffectiveUser;	//!< '-u' Dispense as another user
 char	*gsUserName;	//!< User that dispense will happen as
 char	*gsUserFlags;	//!< User's flag set
  int	giUserBalance=-1;	//!< User balance (set by Authenticate)
+ int	giDispenseCount = 1;	//!< Number of dispenses to do
 
 // === CODE ===
 int main(int argc, char *argv[])
@@ -134,11 +149,26 @@ int main(int argc, char *argv[])
 			case '?':
 				ShowUsage();
 				return 0;
-			
+					
+			case 'c':
+				if( i + 1 >= argc ) {
+					fprintf(stderr, "%s: -c takes an argument\n", argv[0]);
+					ShowUsage();
+					return -1;
+				}
+				giDispenseCount = atoi(argv[++i]);
+				if( giDispenseCount < 1 || giDispenseCount > DISPENSE_MULTIPLE_MAX ) {
+					fprintf(stderr, "Sorry, only 1-20 can be passed to -c (safety)\n");
+					return -1;
+				}
+				
+				break ;
+	
 			case 'm':	// Minimum balance
 				if( i + 1 >= argc ) {
 					fprintf(stderr, "%s: -m takes an argument\n", argv[0]);
 					ShowUsage();
+					return RV_ARGUMENTS;
 				}
 				giMinimumBalance = atoi(argv[++i]);
 				break;
@@ -146,6 +176,7 @@ int main(int argc, char *argv[])
 				if( i + 1 >= argc ) {
 					fprintf(stderr, "%s: -M takes an argument\n", argv[0]);
 					ShowUsage();
+					return RV_ARGUMENTS;
 				}
 				giMaximumBalance = atoi(argv[++i]);
 				break;
@@ -154,6 +185,7 @@ int main(int argc, char *argv[])
 				if( i + 1 >= argc ) {
 					fprintf(stderr, "%s: -u takes an argument\n", argv[0]);
 					ShowUsage();
+					return RV_ARGUMENTS;
 				}
 				gsEffectiveUser = argv[++i];
 				break;
@@ -162,6 +194,7 @@ int main(int argc, char *argv[])
 				if( i + 1 >= argc ) {
 					fprintf(stderr, "%s: -H takes an argument\n", argv[0]);
 					ShowUsage();
+					return RV_ARGUMENTS;
 				}
 				gsDispenseServer = argv[++i];
 				break;
@@ -169,6 +202,7 @@ int main(int argc, char *argv[])
 				if( i + 1 >= argc ) {
 					fprintf(stderr, "%s: -P takes an argument\n", argv[0]);
 					ShowUsage();
+					return RV_ARGUMENTS;
 				}
 				giDispensePort = atoi(argv[++i]);
 				break;
@@ -182,15 +216,11 @@ int main(int argc, char *argv[])
 			case 'n':	// Dry Run / read-only
 				gbDryRun = 1;
 				break;
-			case '0':	case '1':
-			case '2':	case '3':
-			case '4':	case '5':
-			case '6':	case '7':
-			case '8':	case '9':
+			default:
 				if( text_argc + 1 ==  MAX_TXT_ARGS )
 				{
 					fprintf(stderr, "ERROR: Too many arguments\n");
-					return 1;
+					return RV_ARGUMENTS;
 				}
 				text_args[text_argc++] = argv[i];
 				break;
@@ -202,7 +232,7 @@ int main(int argc, char *argv[])
 		if( text_argc + 1 == MAX_TXT_ARGS )
 		{
 			fprintf(stderr, "ERROR: Too many arguments\n");
-			return 1;
+			return RV_ARGUMENTS;
 		}
 	
 		text_args[text_argc++] = argv[i];
@@ -216,22 +246,28 @@ int main(int argc, char *argv[])
 	{
 		// Connect to server
 		sock = OpenConnection(gsDispenseServer, giDispensePort);
-		if( sock < 0 )	return -1;
-			// List accounts?
+		if( sock < 0 )	return RV_SOCKET_ERROR;
+		// List accounts?
 		if( text_argc == 1 ) {
-			Dispense_EnumUsers(sock);
+			ret = Dispense_EnumUsers(sock);
 			close(sock);
-			return 0;
+			return ret;
 		}
 			
 		// text_args[1]: Username
 		
 		// Alter account?
-		if( text_argc == 4 )
+		if( text_argc != 2 )
 		{
+			if( text_argc != 4 ) {
+				fprintf(stderr, "`dispense acct` requires a reason\n");
+				ShowUsage();
+				return RV_ARGUMENTS;
+			}
+			
 			// Authentication required
-			if( Authenticate(sock) )
-				return -1;
+			ret = Authenticate(sock);
+			if(ret)	return ret;
 			
 			// text_args[1]: Username
 			// text_args[2]: Ammount
@@ -244,19 +280,20 @@ int main(int argc, char *argv[])
 					exit(1);
 				}
 				
-				Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]);
+				ret = Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]);
 			}
 			else {
 				// Alter balance
-				Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+				ret = Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]);
 			}
 		}
+		// TODO: Preserve ret if non-zero
 		
 		// Show user information
-		Dispense_ShowUser(sock, text_args[1]);
+		ret = Dispense_ShowUser(sock, text_args[1]);
 		
 		close(sock);
-		return 0;
+		return ret;
 	}
 	//
 	// `dispense give`
@@ -266,7 +303,7 @@ int main(int argc, char *argv[])
 		if( text_argc != 4 ) {
 			fprintf(stderr, "`dispense give` takes three arguments\n");
 			ShowUsage();
-			return -1;
+			return RV_ARGUMENTS;
 		}
 		
 		// text_args[1]: Destination
@@ -275,17 +312,17 @@ int main(int argc, char *argv[])
 		
 		// Connect to server
 		sock = OpenConnection(gsDispenseServer, giDispensePort);
-		if( sock < 0 )	return -1;
+		if( sock < 0 )	return RV_SOCKET_ERROR;
 		
 		// Authenticate
-		if( Authenticate(sock) )
-			return -1;
+		ret = Authenticate(sock);
+		if(ret)	return ret;
 		
-		Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+		ret = Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
 
 		close(sock);
 	
-		return 0;
+		return ret;
 	}
 	// 
 	// `dispense user`
@@ -296,16 +333,16 @@ int main(int argc, char *argv[])
 		if( text_argc == 1 ) {
 			fprintf(stderr, "Error: `dispense user` requires arguments\n");
 			ShowUsage();
-			exit(1);
+			return RV_ARGUMENTS;
 		}
 		
 		// Connect to server
 		sock = OpenConnection(gsDispenseServer, giDispensePort);
-		if( sock < 0 )	return -1;
+		if( sock < 0 )	return RV_SOCKET_ERROR;
 		
 		// Attempt authentication
-		if( Authenticate(sock) )
-			return -1;
+		ret = Authenticate(sock);
+		if(ret)	return ret;
 		
 		// Add new user?
 		if( strcmp(text_args[1], "add") == 0 )
@@ -313,10 +350,10 @@ int main(int argc, char *argv[])
 			if( text_argc != 3 ) {
 				fprintf(stderr, "Error: `dispense user add` requires an argument\n");
 				ShowUsage();
-				exit(1);
+				return RV_ARGUMENTS;
 			}
 			
-			Dispense_AddUser(sock, text_args[2]);
+			ret = Dispense_AddUser(sock, text_args[2]);
 		}
 		// Update a user
 		else if( strcmp(text_args[1], "type") == 0 || strcmp(text_args[1], "flags") == 0 )
@@ -324,19 +361,19 @@ int main(int argc, char *argv[])
 			if( text_argc != 4 ) {
 				fprintf(stderr, "Error: `dispense user flags` requires two arguments\n");
 				ShowUsage();
-				exit(1);
+				return RV_ARGUMENTS;
 			}
 			
-			Dispense_SetUserType(sock, text_args[2], text_args[3]);
+			ret = Dispense_SetUserType(sock, text_args[2], text_args[3]);
 		}
 		else
 		{
 			fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
 			ShowUsage();
-			exit(1);
+			return RV_ARGUMENTS;
 		}
 		close(sock);
-		return 0;
+		return ret;
 	}
 	// Donation!
 	else if( strcmp(text_args[0], "donate") == 0 )
@@ -345,23 +382,57 @@ int main(int argc, char *argv[])
 		if( text_argc != 3 ) {
 			fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
 			ShowUsage();
-			exit(1);
+			return RV_ARGUMENTS;
 		}
 		
 		// Connect to server
 		sock = OpenConnection(gsDispenseServer, giDispensePort);
-		if( sock < 0 )	return -1;
+		if( sock < 0 )	return RV_SOCKET_ERROR;
 		
 		// Attempt authentication
-		if( Authenticate(sock) )
-			return -1;
+		ret = Authenticate(sock);
+		if(ret)	return ret;
 		
 		// Do donation
-		Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
+		ret = Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
 				
 		close(sock);
 
-		return 0;
+		return ret;
+	}
+	// Refund an item
+	else if( strcmp(text_args[0], "refund") == 0 )
+	{
+		 int	 price = 0;
+		// Check argument count
+		if( text_argc != 3 && text_argc != 4 ) {
+			fprintf(stderr, "Error: `dispense refund` takes 2 or 3 arguments\n");
+			ShowUsage();
+			return RV_ARGUMENTS;
+		}
+	
+		// Connect to server
+		sock = OpenConnection(gsDispenseServer, giDispensePort);
+		if(sock < 0)	return RV_SOCKET_ERROR;	
+
+		// Attempt authentication
+		ret = Authenticate(sock);
+		if(ret)	return ret;
+
+		if( text_argc == 4 ) {
+			price = atoi(text_args[3]);
+			if( price <= 0 ) {
+				fprintf(stderr, "Error: Override price is invalid (should be > 0)\n");
+				return RV_ARGUMENTS;
+			}
+		}
+
+		// Username, Item, cost
+		ret = Dispense_Refund(sock, text_args[1], text_args[2], price);
+
+		// TODO: More
+		close(sock);
+		return RV_UNKNOWN_ERROR;
 	}
 	// Query an item price
 	else if( strcmp(text_args[0], "iteminfo") == 0 )
@@ -373,22 +444,23 @@ int main(int argc, char *argv[])
 		if( text_argc != 2 ) {
 			fprintf(stderr, "Error: `dispense iteminfo` requires an argument\n");
 			ShowUsage();
-			exit(1);
+			return RV_ARGUMENTS;
 		}
 		// Parse item ID
 		if( RunRegex(&gUserItemIdentRegex, text_args[1], 3, matches, NULL) != 0 ) {
 			fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
-			exit(1);
+			return RV_ARGUMENTS;
 		}
 		type = text_args[1] + matches[1].rm_so;
 		text_args[1][ matches[1].rm_eo ] = '\0';
 		id = atoi( text_args[1] + matches[2].rm_so );
 
 		sock = OpenConnection(gsDispenseServer, giDispensePort);
-		if( sock < 0 )	return -1;
-		Dispense_ItemInfo(sock, type, id);
+		if( sock < 0 )	return RV_SOCKET_ERROR;
+		
+		ret = Dispense_ItemInfo(sock, type, id);
 		close(sock);
-		return 0;
+		return ret;
 	}
 	// Item name / pattern
 	else {
@@ -397,10 +469,11 @@ int main(int argc, char *argv[])
 	
 	// Connect to server
 	sock = OpenConnection(gsDispenseServer, giDispensePort);
-	if( sock < 0 )	return -1;
+	if( sock < 0 )	return RV_SOCKET_ERROR;
 
 	// Get the user's balance
-	GetUserBalance(sock);
+	ret = GetUserBalance(sock);
+	if(ret)	return ret;
 
 	// Get items
 	PopulateItemList(sock);
@@ -416,11 +489,12 @@ int main(int argc, char *argv[])
 		{
 			// Connect, Authenticate, dispense and close
 			sock = OpenConnection(gsDispenseServer, giDispensePort);
-			if( sock < 0 )	return -1;
-			Authenticate(sock);
-			DispenseItem(sock, "door", 0);
+			if( sock < 0 )	return RV_SOCKET_ERROR;
+			ret = Authenticate(sock);
+			if(ret)	return ret;
+			ret = DispenseItem(sock, "door", 0);
 			close(sock);
-			return 0;
+			return ret;
 		}
 		// Item id (<type>:<num>)
 		else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 )
@@ -436,14 +510,15 @@ int main(int argc, char *argv[])
 			
 			// Connect, Authenticate, dispense and close
 			sock = OpenConnection(gsDispenseServer, giDispensePort);
-			if( sock < 0 )	return -1;
+			if( sock < 0 )	return RV_SOCKET_ERROR;
 			
 			Dispense_ItemInfo(sock, ident, id);
 			
-			Authenticate(sock);
-			DispenseItem(sock, ident, id);
+			ret = Authenticate(sock);
+			if(ret)	return ret;
+			ret = DispenseItem(sock, ident, id);
 			close(sock);
-			return 0;
+			return ret;
 		}
 		// Item number (6 = coke)
 		else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 )
@@ -484,7 +559,7 @@ int main(int argc, char *argv[])
 					// TODO: Allow ambiguous matches?
 					// or just print a wanrning
 					printf("Warning - Ambiguous pattern, stopping\n");
-					return 1;
+					return RV_BAD_ITEM;
 				}
 			}
 			
@@ -492,7 +567,7 @@ int main(int argc, char *argv[])
 			if( best == -1 )
 			{
 				fprintf(stderr, "No item matches the passed string\n");
-				return 1;
+				return RV_BAD_ITEM;
 			}
 			
 			i = best;
@@ -543,14 +618,24 @@ int main(int argc, char *argv[])
 	// Check for a valid item ID
 	if( i >= 0 )
 	{
+		 int j;
 		// Connect, Authenticate, dispense and close
 		sock = OpenConnection(gsDispenseServer, giDispensePort);
-		if( sock < 0 )	return -1;
+		if( sock < 0 )	return RV_SOCKET_ERROR;
 			
-		Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
+		ret = Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
+		if(ret)	return ret;
+		
+		ret = Authenticate(sock);
+		if(ret)	return ret;
 		
-		Authenticate(sock);
-		ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+		for( j = 0; j < giDispenseCount; j ++ ) {
+			ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+			if( ret )	break;
+		}
+		if( j > 1 ) {
+			printf("%i items dispensed\n", j);
+		}
 		close(sock);
 	}
 
@@ -588,6 +673,8 @@ void ShowUsage(void)
 		"        Flags are removed by preceding the name with '-' or '!'\n"
 		"\n"
 		"General Options:\n"
+		"    -c <count>\n"
+		"        Dispense multiple times\n"
 		"    -u <username>\n"
 		"        Set a different user (Coke members only)\n"
 		"    -h / -?\n"
@@ -608,9 +695,6 @@ void ShowUsage(void)
  */
 int ShowNCursesUI(void)
 {
-	// TODO: ncurses interface (with separation between item classes)
-	// - Hmm... that would require standardising the item ID to be <class>:<index>
-	// Oh, why not :)
 	 int	ch;
 	 int	i, times;
 	 int	xBase, yBase;
@@ -636,11 +720,11 @@ int ShowNCursesUI(void)
 		username = pwd->pw_name;
 	}
 	// Get balance
-	snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, giUserBalance%100);
+	snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100);
 	
 	// Enter curses mode
 	initscr();
-	raw(); noecho();
+	cbreak(); noecho();
 	
 	// Get max index
 	maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
@@ -783,6 +867,7 @@ int ShowNCursesUI(void)
 			case '\n':
 				ret = ShowItemAt(0, 0, 0, currentItem, 0);
 				break;
+			case 0x1b:	// Escape
 			case 'q':
 				ret = -1;	// -1: Return with no dispense
 				break;
@@ -860,6 +945,8 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 	// Width = 0, don't print
 	if( Width > 0 )
 	{
+		// 4 preceding, 5 price
+		int nameWidth = Width - 4 - 5;
 		move( Row, Col );
 		
 		if( Index >= 0 )
@@ -869,26 +956,26 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 			{
 			case 0:
 				if( bHilighted )
-					printw("-> ");
+					printw("->  ");
 				else
-					printw("   ");
+					printw("    ");
 				break;
 			case 1:
-				printw("SLD");
+				printw("SLD ");
 				break;
 			
 			default:
 			case -1:
-				printw("ERR");
+				printw("ERR ");
 				break;
 			}
 			
-			printw(" %s", name);
+			printw("%-*.*s", nameWidth, nameWidth, name);
 		
-			getyx(stdscr, _y, _x);
+//			getyx(stdscr, _y, _x);
 			// Assumes max 4 digit prices
-			times = Width - 5 - (_x - Col);	// TODO: Better handling for large prices
-			while(times--)	addch(' ');
+//			times = Width - 5 - (_x - Col);	// TODO: Better handling for large prices
+//			while(times--)	addch(' ');
 			
 			printw(" %4i", price);
 		}
@@ -1026,6 +1113,9 @@ int OpenConnection(const char *Host, int Port)
 		fprintf(stderr, "Failed to connect to server\n");
 		return -1;
 	}
+
+	// We're not authenticated if the connection has just opened
+	gbIsAuthenticated = 0;
 	
 	return sock;
 }
@@ -1039,9 +1129,11 @@ int Authenticate(int Socket)
 	struct passwd	*pwd;
 	char	*buf;
 	 int	responseCode;
+	#if ATTEMPT_PASSWORD_AUTH
 	char	salt[32];
 	 int	i;
 	regmatch_t	matches[4];
+	#endif
 	
 	if( gbIsAuthenticated )	return 0;
 	
@@ -1063,7 +1155,8 @@ int Authenticate(int Socket)
 	
 	case 401:	// Untrusted, attempt password authentication
 		free(buf);
-		
+
+		#if ATTEMPT_PASSWORD_AUTH	
 		sendf(Socket, "USER %s\n", pwd->pw_name);
 		printf("Using username %s\n", pwd->pw_name);
 		
@@ -1077,7 +1170,7 @@ int Authenticate(int Socket)
 		if( responseCode != 100 ) {
 			fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
 			free(buf);
-			return -1;	// ERROR
+			return RV_UNKNOWN_ERROR;	// ERROR
 		}
 		
 		// Check for salt
@@ -1123,23 +1216,28 @@ int Authenticate(int Socket)
 			
 			fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
 			free(buf);
-			return -1;
+			return RV_UNKNOWN_ERROR;
 		}
 		free(buf);
 		if( i == 3 )
-			return 2;	// 2 = Bad Password
+			return RV_INVALID_USER;	// 2 = Bad Password
+		
+		#else
+		fprintf(stderr, "Untrusted host, AUTOAUTH unavaliable\n");
+		return RV_INVALID_USER;
+		#endif
 		break;
 	
 	case 404:	// Bad Username
 		fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
 		free(buf);
-		return 1;
+		return RV_INVALID_USER;
 	
 	default:
 		fprintf(stderr, "Unkown response code %i from server\n", responseCode);
 		printf("%s\n", buf);
 		free(buf);
-		return -1;
+		return RV_UNKNOWN_ERROR;
 	}
 	
 	// Set effective user
@@ -1158,18 +1256,18 @@ int Authenticate(int Socket)
 		case 403:
 			printf("Only coke members can use `dispense -u`\n");
 			free(buf);
-			return -1;
+			return RV_PERMISSIONS;
 		
 		case 404:
 			printf("Invalid user selected\n");
 			free(buf);
-			return -1;
+			return RV_INVALID_USER;
 		
 		default:
 			fprintf(stderr, "Unkown response code %i from server\n", responseCode);
 			printf("%s\n", buf);
 			free(buf);
-			exit(-1);
+			return RV_UNKNOWN_ERROR;
 		}
 		
 		free(buf);
@@ -1208,13 +1306,13 @@ int GetUserBalance(int Socket)
 	case 404:
 		printf("Invalid user? (USER_INFO failed)\n");
 		free(buf);
-		return -1;
+		return RV_INVALID_USER;
 	
 	default:
 		fprintf(stderr, "Unkown response code %i from server\n", responseCode);
 		printf("%s\n", buf);
 		free(buf);
-		exit(-1);
+		return RV_UNKNOWN_ERROR;
 	}
 
 	RunRegex(&gUserInfoRegex, buf, 6, matches, "Malformed server response");
@@ -1250,11 +1348,12 @@ int ReadItemInfo(int Socket, tItem *Dest)
 	case 406:
 		printf("Bad item name\n");
 		free(buf);
-		return 1;
+		return RV_BAD_ITEM;
 	
 	default:
 		fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n%s", responseCode, buf);
-		exit(-1);
+		free(buf);
+		return RV_UNKNOWN_ERROR;
 	}
 	
 	RunRegex(&gItemRegex, buf, 8, matches, "Malformed server response");
@@ -1276,7 +1375,7 @@ int ReadItemInfo(int Socket, tItem *Dest)
 	else {
 		fprintf(stderr, "Unknown response from dispense server (status '%s')\n",
 			statusStr);
-		return 1;
+		return RV_UNKNOWN_ERROR;
 	}
 	Dest->Price = atoi( buf + matches[6].rm_so );
 	
@@ -1316,7 +1415,7 @@ void PopulateItemList(int Socket)
 	responseCode = atoi(buf);
 	if( responseCode != 201 ) {
 		fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
-		exit(-1);
+		exit(RV_UNKNOWN_ERROR);
 	}
 	
 	// - Get item list -
@@ -1334,7 +1433,7 @@ void PopulateItemList(int Socket)
 		// What the?!
 		fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
 			itemType);
-		exit(-1);
+		exit(RV_UNKNOWN_ERROR);
 	}
 		
 	itemStart = &buf[ matches[3].rm_eo ];
@@ -1372,14 +1471,13 @@ void PopulateItemList(int Socket)
 int Dispense_ItemInfo(int Socket, const char *Type, int ID)
 {
 	tItem	item;
+	 int	ret;
 	
 	// Query
 	sendf(Socket, "ITEM_INFO %s:%i\n", Type, ID);
 	
-	if( ReadItemInfo(Socket, &item) )
-	{
-		return -1;
-	}
+	ret = ReadItemInfo(Socket, &item);
+	if(ret)	return ret;
 	
 	printf("%8s:%-2i %2i.%02i %s\n",
 		item.Type, item.ID,
@@ -1420,15 +1518,15 @@ int DispenseItem(int Socket, const char *Type, int ID)
 		break;
 	case 401:
 		printf("Not authenticated\n");
-		ret = 1;
+		ret = RV_PERMISSIONS;
 		break;
 	case 402:
 		printf("Insufficient balance\n");
-		ret = 1;
+		ret = RV_BALANCE;
 		break;
 	case 406:
 		printf("Bad item name\n");
-		ret = 1;
+		ret = RV_BAD_ITEM;
 		break;
 	case 500:
 		printf("Item failed to dispense, is the slot empty?\n");
@@ -1440,7 +1538,7 @@ int DispenseItem(int Socket, const char *Type, int ID)
 		break;
 	default:
 		printf("Unknown response code %i ('%s')\n", responseCode, buf);
-		ret = -2;
+		ret = RV_UNKNOWN_ERROR;
 		break;
 	}
 	
@@ -1461,6 +1559,12 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c
 		printf("Dry Run - No action\n");
 		return 0;
 	}
+
+	// Sanity
+	if( Ammount == 0 ) {
+		printf("An ammount would be nice\n");
+		return RV_ARGUMENTS;
+	}
 	
 	sendf(Socket, "ADD %s %i %s\n", Username, Ammount, Reason);
 	buf = ReadLine(Socket);
@@ -1536,13 +1640,13 @@ int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Rea
 	
 	if( Ammount < 0 ) {
 		printf("Sorry, you can only give, you can't take.\n");
-		return -1;
+		return 1;
 	}
 	
 	// Fast return on zero
 	if( Ammount == 0 ) {
 		printf("Are you actually going to give any?\n");
-		return 0;
+		return 1;
 	}
 	
 	// Check for a dry run
@@ -1552,11 +1656,10 @@ int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Rea
 	}
 	
 	sendf(Socket, "GIVE %s %i %s\n", Username, Ammount, Reason);
+
 	buf = ReadLine(Socket);
-	
 	responseCode = atoi(buf);
-	free(buf);
-	
+	free(buf);	
 	switch(responseCode)
 	{
 	case 200:
@@ -1579,6 +1682,56 @@ int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Rea
 	return -1;
 }
 
+int Dispense_Refund(int Socket, const char *Username, const char *Item, int PriceOverride)
+{
+	char	*buf;
+	 int	responseCode, ret = -1;
+	
+	// Check item id
+	if( RunRegex(&gUserItemIdentRegex, Item, 0, NULL, NULL) != 0 )
+	{
+		fprintf(stderr, "Error: Invalid item ID passed (should be <type>:<num>)\n");
+		return RV_ARGUMENTS;
+	}
+
+	// Check username (quick)
+	if( strchr(Username, ' ') || strchr(Username, '\n') )
+	{
+		fprintf(stderr, "Error: Username is invalid (no spaces or newlines please)\n");
+		return RV_ARGUMENTS;
+	}
+
+	// Send the query
+	sendf(Socket, "REFUND %s %s %i", Username, Item, PriceOverride);
+
+	buf = ReadLine(Socket);
+	responseCode = atoi(buf);
+	switch(responseCode)
+	{
+	case 200:
+		Dispense_ShowUser(Socket, Username);	// Show destination account
+		ret = 0;
+		break;
+	case 403:
+		fprintf(stderr, "Refund access is only avaliable to coke members\n");
+		ret = RV_PERMISSIONS;
+		break;
+	case 404:
+		fprintf(stderr, "Unknown user '%s' passed\n", Username);
+		ret = RV_INVALID_USER;
+		break;
+	case 406:
+		fprintf(stderr, "Invalid item '%s' passed\n", Item);
+		ret = RV_BAD_ITEM;
+		break;
+	default:
+		fprintf(stderr, "Unknown response from server %i\n%s\n", responseCode, buf);
+		ret = -1;
+		break;
+	}
+	free(buf);
+	return ret;
+}
 
 /**
  * \brief Donate money to the club
@@ -1596,7 +1749,7 @@ int Dispense_Donate(int Socket, int Ammount, const char *Reason)
 	// Fast return on zero
 	if( Ammount == 0 ) {
 		printf("Are you actually going to give any?\n");
-		return 0;
+		return 1;
 	}
 	
 	// Check for a dry run