wpdev-commits

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29896

Modified Files:
	account.py 
Log Message:
Fixes


Index: account.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/account.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** account.py	9 Jul 2004 21:08:36 -0000	1.8
--- account.py	15 Jul 2004 18:44:24 -0000	1.9
***************
*** 75,152 ****
  	elif len( args ) > 0:
  		# Command with arguments
! 		try:
! 			args = args.split( ' ' )
! 			# Error Check
! 			if len( args ) >= 5:
  				return False
! 			# One Argument
! 			if len( args ) == 1:
! 				action = args[0]
! 				action = action.lower()
! 				# Reload Accounts
! 				if action == 'reload':
! 					char.log( LOG_MESSAGE, "Reloaded accounts.\n" % char.serial )
! 					wolfpack.accounts.reload()
! 					return True
! 				# Save Accounts
! 				elif action == 'save':
! 					char.log( LOG_MESSAGE, "Saved accounts.\n" % char.serial )
! 					wolfpack.accounts.save()
! 					return True
! 				else:
! 					return False
! 			# Two Arguments
! 			elif len( args ) == 2:
! 				( action, username ) = args
! 				action = action.lower()
! 				username = username.lower()
! 				# Remove Accounts
! 				if action == 'remove':
! 					accountRemove( socket, username )
! 					return True
! 				else:
! 					return False
! 			# Three Arguments
! 			elif len( args ) == 3:
! 				( action, username, key ) = args
! 				action = action.lower()
! 				username = username.lower()
! 				if len( action ) == 0 or len( username ) == 0 or len( key ) == 0:
! 					return False
! 				# Create Accounts
! 				if action == 'create':
! 					accountCreate( socket, username, key )
! 					return True
! 				# Show Accounts
! 				elif action == 'show':
! 					accountShow( socket, username, key )
! 					return True
! 				else:
! 					return False
! 			# Four Arguments
! 			elif len( args ) == 4:
! 				( action, username, key, value ) = args
! 				action = action.lower()
! 				username = username.lower()
! 				key = key.lower()
! 				if len( action ) == 0 or len( username ) == 0 or len( key ) == 0 or len( value ) == 0:
! 					return False
! 				# Set Accounts
! 				if action.lower() == 'set':
! 					accountSet( socket, username, key, value )
! 					return True
! 				else:
! 					return False
! 			# Error
  			else:
  				return False
! 		except:
! 			socket.sysmessage( usage0 )
! 			socket.sysmessage( usage1 )
! 			socket.sysmessage( usage2 )
! 			socket.sysmessage( usage3 )
! 			socket.sysmessage( usage4 )
  			return False
  
  # Removes an account
  def accountRemove( socket, username ):
--- 75,160 ----
  	elif len( args ) > 0:
  		# Command with arguments
! 		args = args.split( ' ' )
! 		# Error Check
! 		if len( args ) >= 5:
! 			useageerror( socket )
! 			return False
! 		# One Argument
! 		if len( args ) == 1:
! 			action = args[0]
! 			action = action.lower()
! 			# Reload Accounts
! 			if action == 'reload':
! 				char.log( LOG_MESSAGE, "Reloaded accounts.\n" % char.serial )
! 				wolfpack.accounts.reload()
! 				return True
! 			# Save Accounts
! 			elif action == 'save':
! 				char.log( LOG_MESSAGE, "Saved accounts.\n" % char.serial )
! 				wolfpack.accounts.save()
! 				return True
! 			else:
! 				useageerror( socket )
  				return False
! 		# Two Arguments
! 		elif len( args ) == 2:
! 			( action, username ) = args
! 			action = action.lower()
! 			username = username.lower()
! 			# Remove Accounts
! 			if action == 'remove':
! 				accountRemove( socket, username )
! 				return True
  			else:
+ 				useageerror( socket )
  				return False
! 		# Three Arguments
! 		elif len( args ) == 3:
! 			( action, username, key ) = args
! 			action = action.lower()
! 			username = username.lower()
! 			if len( action ) == 0 or len( username ) == 0 or len( key ) == 0:
! 				useageerror( socket )
! 				return False
! 			# Create Accounts
! 			if action == 'create':
! 				accountCreate( socket, username, key )
! 				return True
! 			# Show Accounts
! 			elif action == 'show':
! 				accountShow( socket, username, key )
! 				return True
! 			else:
! 				useageerror( socket )
! 				return False
! 		# Four Arguments
! 		elif len( args ) == 4:
! 			( action, username, key, value ) = args
! 			action = action.lower()
! 			username = username.lower()
! 			key = key.lower()
! 			if len( action ) == 0 or len( username ) == 0 or len( key ) == 0 or len( value ) == 0:
! 				useageerror( socket )
! 				return False
! 			# Set Accounts
! 			if action.lower() == 'set':
! 				accountSet( socket, username, key, value )
! 				return True
! 			else:
! 				useageerror( socket )
! 				return False
! 		# Error
! 		else:
! 			useageerror( socket )
  			return False
  
+ def usageerror( socket ):
+ 	socket.sysmessage( usage0 )
+ 	socket.sysmessage( usage1 )
+ 	socket.sysmessage( usage2 )
+ 	socket.sysmessage( usage3 )
+ 	socket.sysmessage( usage4 )
+ 	return
+ 
  # Removes an account
  def accountRemove( socket, username ):
***************
*** 299,306 ****
  					if value in wolfpack.accounts.acls():
  						oldvalue = account.acl
! 						socket.sysmessage( "Previous: %s.acl = %s" % ( account.name, account.acl ) )
! 						account.acl == value
  						socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.acl ) )
! 						char.log( LOG_MESSAGE, "Modified %s.acl ( %s :: %s ).\n" % ( account.name, oldvale, value ) )
  						return True
  					else:
--- 307,314 ----
  					if value in wolfpack.accounts.acls():
  						oldvalue = account.acl
! 						socket.sysmessage( "Previous: %s.acl = %s" % ( account.name, oldvalue ) )
! 						account.acl = value
  						socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.acl ) )
! 						char.log( LOG_MESSAGE, "Modified %s.acl ( %s :: %s ).\n" % ( account.name, oldvalue, value ) )
  						return True
  					else:
***************
*** 318,325 ****
  				elif key == 'multigems':
  					if value.lower() == "true" or value.lower() == "false" or value == 1 or value == 0:
! 						oldvalue = value
! 						socket.sysmessage( "Previous: %s.acl = %s" % ( account.name, account.acl ) )
! 						account.multigems == value
! 						socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.acl ) )
  						char.log( LOG_MESSAGE, "Modified %s.multigems ( %s :: %s ).\n" % ( account.name, oldvalue, value ) )
  						return True
--- 326,333 ----
  				elif key == 'multigems':
  					if value.lower() == "true" or value.lower() == "false" or value == 1 or value == 0:
! 						oldvalue = account.multigems
! 						socket.sysmessage( "Previous: %s.acl = %s" % ( account.name, account.multigems ) )
! 						account.multigems = value
! 						socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.multigems ) )
  						char.log( LOG_MESSAGE, "Modified %s.multigems ( %s :: %s ).\n" % ( account.name, oldvalue, value ) )
  						return True
***************
*** 336,340 ****
  						return False
  					else:
! 						oldvalue = key
  						account.password = key
  						socket.sysmessage( "Changed: %s.password" % ( account.name, account.password ) )
--- 344,348 ----
  						return False
  					else:
! 						oldvalue = account.password
  						account.password = key
  						socket.sysmessage( "Changed: %s.password" % ( account.name, account.password ) )