traipse_dev: orpg/networking/mplay

comparison orpg/networking/mplay_server.py @ 90:d1aff41c031b alpha

Traipse Alpha 'OpenRPG' {090919-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: 00: Adds menu changes to draw attention to important updates, errors, or other events. (image info coming soon) Traipse URL is not included in the repos tab and is set as default. 01: Fixes Copy for Windows and Linux (finally!!) users. Fixes incomplete update to Grid and List nodes. Fixes incomplete update to Chat Commands. 02: Fixes problems with Remote Image Upload. Fixes Drop and Drag of Minis to Map. CherryPy can now use any image in the webfiles/ folder and sub-folders. CherryPy can now Drop and Drag Minis to the Map. 03: Minor changes to Update Manager's GUI. Expert recommendation warning added to Revision Update. Step down compatibility with open_rpg & component added to orpgCore. 19-00: Better backwards compatibility in orpgCore. Using majority of 'Grumpy' network folder to correct server lag.

author	sirebral
date	Sat, 19 Sep 2009 06:45:21 -0500
parents	449a8900f9ac
children	65c1604e7949 7ed4979cc1cf

comparison

equal deleted inserted replaced

-:b84e0799fed2
+:d1aff41c031b
 <create_group from='' pwd='' name='' />
 <join_group from='' pwd='' group_id='' />
 <role action='set,get,display' player='' group_id='' boot_pwd='' role=''/>
 """
-import re
+from mplay_client import *
+from mplay_client import MPLAY_LENSIZE
+from orpg.dirpath import dir_struct
+from orpg.tools.validate import validate
 import gc
 import cgi
 import sys
 import string
 import time
 import urllib
-import traceback
-from mplay_client import *
-from mplay_client import MPLAY_LENSIZE
-from orpg.dirpath import dir_struct
-import orpg.tools.validate
 from orpg.mapper.map_msg import *
 from threading import Lock, RLock
 from struct import pack, unpack, calcsize
 from meta_server_lib import *
+import traceback
+import re
 # Import the minidom XML module
 from xml.dom import minidom
 # Snag the version number
-from orpg.orpg_version import VERSION, PROTOCOL_VERSION, CLIENT_STRING, SERVER_MIN_CLIENT_VERSION
+from orpg.orpg_version import *
 #Plugins
 from server_plugins import ServerPlugins
 def id_compare(a,b):
 if self.mapFile is not None and self.persistant == 1 and self.mapFile.find("default_map.xml") == -1:
 f = open(self.mapFile, "w")
 f.write(self.game_map.get_all_xml())
 f.close()
 def add_player(self,id):
 self.players.append(id)
 def remove_player(self,id):
 if self.voice.has_key(id):
 def get_player_ids(self):
 tmp = self.players
 return tmp
 def check_pwd(self,pwd):
 return (pwd==self.pwd)
 def check_boot_pwd(self,pwd):
 return (pwd==self.boot_pwd)
 def check_version(self,ver):
-if (self.minVersion == ""): return 1
+if (self.minVersion == ""):
+return 1
 minVersion=self.minVersion.split('.')
 version=ver.split('.')
 for i in xrange(min(len(minVersion),len(version))):
 w=max(len(minVersion[i]),len(version[i]))
 v1=minVersion[i].rjust(w);
 v2=version[i].rjust(w);
-if v1<v2: return 1
+if v1<v2:
-if v1>v2: return 0
+return 1
+if v1>v2:
+return 0
 if len(minVersion)>len(version):
 return 0
 return 1
 #depreciated - see send_group_list()
 xml_data += "\" name=\"" + self.name
 xml_data += "\" pwd=\"" + str(self.pwd!="")
 xml_data += "\" players=\"" + str(self.get_num_players())
 xml_data += "\" action=\"" + act + "\" />"
 return xml_data
 class client_stub(client_base):
 def __init__(self,inbox,sock,props,log):
 client_base.__init__(self)
 def clear_timeout(self):
 self.timeout_time = None
 def check_time_out(self):
-if self.timeout_time==None: self.timeout_time = time.time()
+if self.timeout_time==None:
+self.timeout_time = time.time()
 curtime = time.time()
 diff = curtime - self.timeout_time
-if diff > 1800: return 1
+if diff > 1800:
-else: return 0
+return 1
+else:
+return 0
 def send(self,msg,player,group):
 if self.get_status() == MPLAY_CONNECTED:
 self.outbox.put("<msg to='" + player + "' from='0' group_id='" + group + "' />" + msg)
 def take_dom(self,xml_dom):
 self.name = xml_dom.getAttribute("name")
 self.text_status = xml_dom.getAttribute("status")
-"""
 ######################################################################
 ######################################################################
 ##
 ##
 ##   MPLAY SERVER
 ##
 ##
 ######################################################################
 ######################################################################
-"""
 class mplay_server:
 def __init__(self, log_console=None, name=None):
 self.log_to_console = 1
 self.log_console = log_console
 self.maxSendSize = 1024
 self.server_port = OPENRPG_PORT
 self.allowRemoteKill = False
 self.allowRemoteAdmin = True
 self.sendLobbySound = False
-self.lobbySound = 'http://www.digitalxero.net/music/mus_tavern1.bmu' ##used?
+self.lobbySound = 'http://www.digitalxero.net/music/mus_tavern1.bmu'
 def initServer(self, **kwargs):
-for atter, value in kwargs.iteritems(): setattr(self, atter, value)
+for atter, value in kwargs.iteritems():
+setattr(self, atter, value)
 validate.config_file( self.lobbyMapFile, "default_Lobby_map.xml" )
 validate.config_file( self.lobbyMessageFile, "default_LobbyMessage.html" )
 self.server_start_time = time.time()
 # Since the server is just starting here, we read in the XML configuration
 # file.  Notice the lobby is still created here by default.
-self.groups = { '0': game_group('0','Lobby','',
+self.groups = { '0': game_group('0','Lobby','','The game lobby', '', '', self.userPath + self.lobbyMapFile, self.userPath + self.lobbyMessageFile, 1)}
-'The game lobby', '', '', self.userPath + self.lobbyMapFile,
-self.userPath + self.lobbyMessageFile, 1)}
 # Make sure the server's name gets set, in case we are being started from
 # elsewhere.  Basically, if it's passed in, we'll over ride what we were
 # prompted for.  This should never really happen at any rate.
 self.initServerConfig()
 self.addsvrcmd('create_group', self.create_group)
 self.addsvrcmd('moderate', self.moderate_group)
 self.addsvrcmd('plugin', self.plugin_msg_handler)
 self.addsvrcmd('sound', self.sound_msg_handler)
 # This method reads in the server's ban list added by Darren
 def initBanList( self ):
 self.log_msg("Processing Ban List File...")
 # make sure the server_ini.xml exists!
 if not len(self.reg) > 0 or self.reg[0].upper() not in ("Y", "N"):
 opt = raw_input("Do you want to post your server to the OpenRPG Meta Server list? (y,n) ")
 if len(opt) and (opt[0].upper() == 'Y'): self.reg = 'Y'
 else: self.reg = 'N'
 LobbyName = 'Lobby'
 if self.configDoc.hasAttribute("lobbyname"): LobbyName = self.configDoc.getAttribute("lobbyname")
 map_node = service_node = self.configDoc.getElementsByTagName("map")[0]
 msg_node = service_node = self.configDoc.getElementsByTagName("message")[0]
 mapFile = map_node.getAttribute('file')
 msgFile = msg_node.getAttribute('file')
 if mapFile == '': mapFile = 'Lobby_map.xml'
 if msgFile == '': msgFile = 'LobbyMessage.html'
 # Update the lobby with the passwords if they've been specified
 if len(self.boot_pwd):
 self.groups = {'0': game_group( '0', LobbyName, "", 'The game lobby', self.boot_pwd, "",
 self.userPath + mapFile.replace("myfiles/", ""),
 self.userPath + msgFile.replace("myfiles/", ""), 1 )
 }
 self.name = self.configDoc.getAttribute("name")
 else:
 if self.reg[0].upper() == "Y":
 if self.name == None: self.name = raw_input("Server Name? ")
 self.register()
-"""
 # Get the minimum openrpg version from config if available
 # if it isn't set min version to internal default.
 #
 # server_ini.xml entry for version tag...
 # <version min="x.x.x">
-"""
 try:
 mver = self.configDoc.getElementsByTagName("version")[0]
 self.minClientVersion = mver.getAttribute("min")
 except: self.minClientVersion = SERVER_MIN_CLIENT_VERSION #from orpg/orpg_version.py
 self.defaultMessageFile = ""
 # This try/except bit is to allow older versions of python to continue without a list error.
-"""
 #------------------------[ START <AUTOKICK> TAG PROCESSING ]--------------
 # Auto-kick option defaults for silent booting and
 # setting the default zombie-client delay time --Snowdog 9/05
 #
 # server_ini.xml entry for autikick tag...
 # <autokick silent=["no","yes"] delay="(# of seconds)">
-"""
 try:
 ak = self.configDoc.getElementsByTagName("autokick")[0]
 if ak.hasAttribute("silent"):
 if ((ak.getAttribute("silent")).lower() == "yes"): self.silent_auto_kick = 1
 self.log_msg("**WARNING** Error loading autokick settings... using defaults")
 alk = ""
 if (self.silent_auto_kick == 1): alk = "(Silent Mode)"
 self.log_msg("Auto Kick:  Delay="+str(self.zombie_time) + " " + alk)
-"""------------------------[ END <AUTOKICK> TAG PROCESSING ]--------------"""
+#------------------------[ END <AUTOKICK> TAG PROCESSING ]--------------
-"""
 #-------------------------------[ START <ROOM_DEFAULT> TAG PROCESSING ]--------------------
 #
 # New room_defaults configuration option used to set various defaults
 # for all user created rooms on the server. Incorporates akomans older
 # default room message code (from above)      --Snowdog 11/03
 #
 # option syntax
 # <room_defaults passwords="yes" map="myfiles/LobbyMap.xml" message="myfiles/LobbyMessage.html" />
-"""
 #default settings for tag options...
 roomdefault_msg = str(self.defaultMessageFile) #no message is the default
 roomdefault_map = "" #use lobby map as default
 roomdefault_pass = 1 #allow passwords
 setting = roomdefaults.getElementsByTagName('map')[0]
 map = setting.getAttribute('file')
 if map != "":
 roomdefault_map = self.userPath + map.replace("myfiles/", "")
 self.log_msg("Room Defaults: Using " + str(map) + " for room map")
-except: self.log_msg("Room Defaults: [Warning] Using Default Map")
+except:
+self.log_msg("Room Defaults: [Warning] Using Default Map")
 try:
 setting = roomdefaults.getElementsByTagName('message')[0]
 msg = setting.getAttribute('file')
 if msg != "":
 except: print ("Room Defaults: [Warning] Using Default Message")
 except:
 traceback.print_exc()
 self.log_msg("**WARNING** Error loading default room settings from configuration file. Using internal defaults.")
 #set the defaults
 if roomdefault_msg != "" or roomdefault_msg != None:
 self.defaultMessageFile = roomdefault_msg  #<room_defaults> tag superceeds older <newrooms> tag
 else: self.defaultMessageFile = None
 if roomdefault_map != "" or roomdefault_map != None:
 self.defaultMapFile = roomdefault_map  #<room_defaults> tag superceeds older <newrooms> tag
 else: self.defaultMapFile = None
 ##### room default map not handled yet. SETTING IGNORED
 if roomdefault_pass == 0: self.allow_room_passwords = 0
 else: self.allow_room_passwords = 1
-"""-------------------------------[ END <ROOM_DEFAULT> TAG PROCESSING ]--------------------"""
+#-------------------------------[ END <ROOM_DEFAULT> TAG PROCESSING ]--------------------
 ###Server Cheat message
 try:
 cheat_node = self.configDoc.getElementsByTagName("cheat")[0]
 self.cheat_msg = cheat_node.getAttribute("text")
 except:
 self.cheat_msg = "**FAKE ROLL**"
 self.log_msg("**WARNING** <cheat txt=\"\"> tag missing from server configuration file. Using empty string.")
 # should validate protocal
 validate_protocol_node = self.configDom.getElementsByTagName("validate_protocol ")
 self.validate_protocol = 1
 if(validate_protocol_node): self.validate_protocol = (validate_protocol_node[0].getAttribute("value") == "True")
 if(self.validate_protocol != 1): self.log_msg("Protocol Validation: OFF")
 self.makePersistentRooms()
 self.log_msg("Server Configuration File: Processing Completed.")
 except Exception, e:
 traceback.print_exc()
 self.log_msg("Exception in initServerConfig() " + str(e))
 def makePersistentRooms(self):
 'Creates rooms on the server as defined in the server config file.'
 for element in self.configDom.getElementsByTagName('room'):
 roomName = element.getAttribute('name')
 roomPassword = element.getAttribute('password')
 bootPassword = element.getAttribute('boot')
 # Extract the map filename attribute from the map node
 # we only care about the first map element found -- others are ignored
 mapElement = element.getElementsByTagName('map')[0]
 mapFile = self.userPath + mapElement.getAttribute('file').replace("myfiles/", "")
 messageElement = element.getElementsByTagName('message')[0]
 messageFile = messageElement.getAttribute('file')
 if messageFile[:4] != 'http': messageFile = self.userPath + messageFile.replace("myfiles/", "")
 # Make sure we have a message to even mess with
 if(len(messageFile) == 0): messageFile = self.defaultMessageFile
 if(len(mapFile) == 0): mapFile = self.defaultMapFile
 moderated = 0
 if element.hasAttribute('moderated') and element.getAttribute('moderated').lower() == "true": moderated = 1
 #create the new persistant group
-self.new_group(roomName, roomPassword,
+self.new_group(roomName, roomPassword, bootPassword, minVersion, mapFile, messageFile, persist = 1, moderated=moderated)
-bootPassword, minVersion, mapFile,
-messageFile, persist = 1, moderated=moderated)
 def isPersistentRoom(self, id):
 'Returns True if the id is a persistent room (other than the lobby), otherwise, False.'
-"""
 # altered persistance tracking from simple room id based to per-group setting
 # allows arbitrary rooms to be marked as persistant without needing the self.persistRoomThreshold
 # -- Snowdog 4/04
-"""
 try:
 id = str(id) #just in case someone sends an int instead of a str into the function
 if id not in self.groups: return 0 #invalid room, can't be persistant
 pr = (self.groups[id]).persistant
 return pr
 except:
 self.log_msg("Exception occured in isPersistentRoom(self,id)")
 return 0
 #-----------------------------------------------------
 #  Toggle Meta Logging  -- Added by Snowdog 4/03
 #-----------------------------------------------------
 def toggleMetaLogging(self):
 else: return
 #when log mode changes update all connection stubs
 for n in self.players:
 try: self.players[n].EnableMessageLogging = mode
 except: self.log_msg("Error changing Message Logging Mode for client #" + str(self.players[n].id))
 def NetworkLoggingStatus(self):
 if self.log_network_messages == 0: return "Network Traffic Log: Off"
 elif self.log_network_messages == 1: return "Network Traffic Log: Logging (composite file)"
 elif self.log_network_messages == 2: return "Network Traffic Log: Logging (inbound/outbound files)"
 else: self.log_msg("Network Traffic Log: [Unknown]")
 def register_callback(instance, xml_dom = None,source=None):
 if xml_dom:    # if we get something
 if source == getMetaServerBaseURL():    # if the source of this DOM is the authoritative meta
 try:
 finally:
 metacache_lock.release()
 if newlist != curlist:          #  If the two lists aren't identical
 #  then something has changed.
-instance.register()         #  Call self.register()
+instance.register()             #  Call self.register()
 #  which will force a re-read of the meta cache and
 #  redo the registerThreads
 else: instance.register()
 # Eventually, reset the MetaServerBaseURL here
-"""
 ## Added to help clean up parser errors in the XML on clients
 ## due to characters that break welformedness of the XML from
 ## the meta server.
 ## NOTE: this is a stopgap measure -SD
-"""
 def clean_published_servername(self, name):
 #clean name of all apostrophes and quotes
 badchars = "\"\\`><"
 for c in badchars: name = name.replace(c,"")
 return name
 id = '0'
 time.sleep(500)
 for rnum in self.groups.keys():
 rooms += urllib.urlencode( {"room_data[rooms][" + str(rnum) + "][name]":self.groups[rnum].name,
 "room_data[rooms][" + str(rnum) + "][pwd]":str(self.groups[rnum].pwd != "")})+'&'
 for pid in self.groups[rnum].players:
 rooms += urllib.urlencode( {"room_data[rooms][" + str(rnum) + "][players]["+str(pid)+"]":self.players[pid].name,})+'&'
 for meta in self.metas.keys():
 while id == '0':
 id, cookie = self.metas[meta].getIdAndCookie()
 data = urllib.urlencode( {"room_data[server_id]":id,
 "act":'registerrooms'})
 get_server_dom(data+'&'+rooms, self.metas[meta].path)
 def register(self,name_given=None):
 if name_given == None: name = self.name
 else: self.name = name = name_given
 name = self.clean_published_servername(name)
 #  Set up the value for num_users
 if self.players: num_players = len(self.players)
 else: num_players = 0
 metalist = getMetaServers(versions=["2"])
 if self.show_meta_messages != 0:
 self.log_msg("Found these valid metas:")
 for meta in metalist: self.log_msg("Meta:" + meta)
-"""
 #  Go through the list and see if there is already a running register
 #  thread for the meta.
 #  If so, call it's register() method
 #  If not, start one, implicitly calling the new thread's register() method
 #  iterate through the currently running metas and prune any
 #  not currently listed in the Meta Server list.
-"""
 if self.show_meta_messages != 0: self.log_msg( "Checking running register threads for outdated metas.")
 for meta in self.metas.keys():
 if self.show_meta_messages != 0: self.log_msg("meta:" + meta + ": ")
 if not meta in metalist:  # if the meta entry running is not in the list
 if self.show_meta_messages != 0: self.log_msg( "Outdated.  Unregistering and removing")
 if self.show_meta_messages != 0: self.log_msg( "Found in current meta list.  Leaving intact.")
 #  Now call register() for alive metas or start one if we need one
 for meta in metalist:
 if self.metas.has_key(meta) and self.metas[meta] and self.metas[meta].isAlive():
-self.metas[meta].register(name=name,
+self.metas[meta].register(name=name, realHostName=self.server_address, num_users=num_players)
-realHostName=self.server_address,
-num_users=num_players)
 else:
-self.metas[meta] = registerThread(name=name, realHostName=self.server_address,
+self.metas[meta] = registerThread(name=name, realHostName=self.server_address, num_users=num_players, MetaPath=meta, port=self.server_port,register_callback=self.register_callback)
-num_users=num_players, MetaPath=meta, port=self.server_port,
-register_callback=self.register_callback)
 self.metas[meta].start()
 #The register Rooms thread
 self.be_registered = 1
 thread.start_new_thread(self.registerRooms,(0,))
 def unregister(self):
-"""
 #  loop through all existing meta entries
 #  Don't rely on getMetaServers(), as a server may have been
 #  removed since it was started.  In that case, then the meta
 #  would never get unregistered.
 #
 #  Instead, loop through all existing meta threads and unregister them
-"""
 for meta in self.metas.values():
 if meta and meta.isAlive(): meta.unregister()
 self.be_registered = 0
-"""
 #  This method runs as it's own thread and does the group_member_check every
 #    sixty seconds.  This should eliminate zombies that linger when no one is
 #    around to spook them.  GC: Frequency has been reduced as I question how valid
 #    the implementation is as it will only catch a very small segment of lingering
 #    connections.
-"""
 def player_reaper_thread_func(self,arg):
 while self.alive:
 time.sleep(60)
 self.p_lock.acquire()
 for group in self.groups.keys(): self.check_group_members(group)
 self.p_lock.release()
 #This thread runs ever 250 miliseconds, and checks various plugin stuff
 def PluginThread(self):
 while self.alive:
 self.p_lock.acquire()
 players = ServerPlugins.getPlayer()
 for player in players:
 if player is not None: pass #Do something here so they can show up in the chat room for non web users'
 data = ServerPlugins.preParseOutgoing()
 for msg in data:
 try:
 xml_dom = parseXml(msg)
 xml_dom = xml_dom._get_documentElement()
 if xml_dom.hasAttribute('from') and int(xml_dom.getAttribute('from')) > -1:
 xml_dom.setAttribute('from', '-1')
 xml_dom.setAttribute('to', 'all')
 self.incoming_msg_handler(xml_dom, msg)
 xml_dom.unlink()
 except: pass
 self.p_lock.release()
 time.sleep(0.250)
 def sendMsg( self, sock, msg, useCompression=False, cmpType=None):
 """Very simple function that will properly encode and send a message to te
 remote on the specified socket."""
 if useCompression and cmpType != None:
 mpacket = cmpType.compress(msg)
 lpacket = pack('!i', len(mpacket))
 sock.send(lpacket)
 offset = 0
 while offset < len(mpacket):
 slice = buffer(mpacket, offset, len(mpacket)-offset)
 sent = sock.send(slice)
 offset += sent
 def recvData( self, sock, readSize ):
 """Simple socket receive method.  This method will only return when the exact
 byte count has been read from the connection, if remote terminates our
 connection or we get some other socket exception."""
 data = ""
 offset = 0
 try:
 while offset != readSize:
 frag = sock.recv( readSize - offset )
 # Loudly raise an exception because we've been disconnected!
 raise IOError, "Remote closed the connection!"
 else: # Continue to build complete message
 offset += rs
 data += frag
 except socket.error, e:
 self.log_msg("Socket Error: recvData(): " +  e )
 data = ""
 return data
 with the OS until we attempt to read the next complete message."""
 msgData = ""
 try:
 lenData = self.recvData( sock, MPLAY_LENSIZE )
-(length,) = unpack('!i', lenData) # Now, convert to a usable form
+# Now, convert to a usable form
-msgData = self.recvData( sock, length ) # Read exactly the remaining amount of data
+(length,) = unpack('!i', lenData)
+# Read exactly the remaining amount of data
+msgData = self.recvData( sock, length )
 try:
 if useCompression and cmpType != None: msgData = cmpType.decompress(msgData)
 except: traceback.print_exc()
 except Exception, e: self.log_msg( "Exception: recvMsg(): " + str(e) )
 return msgData
 def kill_server(self):
 self.alive = 0
 self.log_msg("Server stopping...")
 self.unregister()                    # unregister from the Meta
 for p in self.players.itervalues():
 p.disconnect()
 self.incoming.put("<system/>")
 for g in self.groups.itervalues():
 g.save_map()
 try:
 ip = socket.gethostbyname(socket.gethostname())
 kill = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 kill.connect((ip, self.server_port))
 self.listen_sock.close()
 self.listen_event.wait(10)
 self.incoming_event.wait(10)
 self.log_msg("Server stopped!")
 def log_msg(self,msg):
 if self.log_to_console:
-if self.log_console: self.log_console(msg)
+if self.log_console:
-else: print str(msg)
+self.log_console(msg)
+else:
+print str(msg)
 def print_help(self):
 print
 print "Commands: "
 print "'kill' or 'quit' - to stop the server"
 print "'togglelobbysound' - Will turn on or off the Auto sending of a sound to all players who join the loby"
 print "'lobbysound' - Lets you specify which sound file to send to players joining the lobby"
 print "'help' or '?' or 'h' - for this help message"
 print
 def broadcast(self,msg):
 self.send_to_all("0","<msg to='all' from='0' group_id='1'><font color='#FF0000'>" + msg + "</font>")
 def console_log(self):
 if self.log_to_console == 1:
 print "console logging now off"
 self.log_to_console = 0
 else:
 print "console logging now on"
 self.log_to_console = 1
 def groups_list(self):
 self.p_lock.acquire()
 try:
 keys = self.groups.keys()
 for k in keys:
 pw = "-"
 pr = " -"
-if self.groups[k].pwd != "": pw = "P"
+if self.groups[k].pwd != "":
-if self.isPersistentRoom( k ): pr = " S" #using S for static (P for persistant conflicts with password)
+pw = "P"
+if self.isPersistentRoom( k ):
+pr = " S" #using S for static (P for persistant conflicts with password)
 print "Group: " + k + pr + pw + '  Name: ' + self.groups[k].name
 print
 except Exception, e:
 self.log_msg(str(e))
 self.p_lock.release()
-"""
+#----------------------------------------------------------------
-#----------------------------------------------------------------
+#  Monitor Function  -- Added by snowdog 2/05
-#  Monitor Function  -- Added by snowdog 2/05
+#----------------------------------------------------------------
-#----------------------------------------------------------------
-"""
 def monitor(self, pid, mode=1 ):
 "allows monitoring of a specific user(s) network i/o"
 #if mode is not set to 1 then monitor adds toggles the state
 #of monitoring on the given user
 if (mode == 1):
 for p in self.players:
 try: p.monitor("off")
 except: pass
 try:
 r = (self.players[pid]).set_traffic_monitor("toggle")
 self.log_msg("Monitor: Mode=" + str(r) + " on Player #" + str(pid))
 except:
 self.log_msg("Monitor: Invalid Player ID")
 traceback.print_exc()
 def search(self,patern):
 keys = self.groups.keys()
 print "Search results:"
 for k in keys:
 ids = self.groups[k].get_player_ids()
 for id in ids:
-if self.players[id].id.find(patern)>-1: self.print_player_info(self.players[id])
+if self.players[id].id.find(patern)>-1:
-elif self.players[id].name.find(patern)>-1: self.print_player_info(self.players[id])
+self.print_player_info(self.players[id])
-elif self.players[id].ip.find(patern)>-1: self.print_player_info(self.players[id])
-elif self.players[id].group_id.find(patern)>-1: self.print_player_info(self.players[id])
+elif self.players[id].name.find(patern)>-1:
-elif self.players[id].role.find(patern)>-1: self.print_player_info(self.players[id])
+self.print_player_info(self.players[id])
-elif self.players[id].version.find(patern)>-1: self.print_player_info(self.players[id])
-elif self.players[id].protocol_version.find(patern)>-1: self.print_player_info(self.players[id])
+elif self.players[id].ip.find(patern)>-1:
-elif self.players[id].client_string.find(patern)>-1: self.print_player_info(self.players[id])
+self.print_player_info(self.players[id])
+elif self.players[id].group_id.find(patern)>-1:
+self.print_player_info(self.players[id])
+elif self.players[id].role.find(patern)>-1:
+self.print_player_info(self.players[id])
+elif self.players[id].version.find(patern)>-1:
+self.print_player_info(self.players[id])
+elif self.players[id].protocol_version.find(patern)>-1:
+self.print_player_info(self.players[id])
+elif self.players[id].client_string.find(patern)>-1:
+self.print_player_info(self.players[id])
 def print_player_info(self,player):
-print player.id, player.name, player.ip, player.group_id, player.role, player.version, player.protocol_version, player.client_string
+print player.id,player.name,player.ip,player.group_id, player.role,player.version,player.protocol_version,player.client_string
-"""
 #----------------------------------------------------------------
 #  Uptime Function  -- Added by snowdog 4/03
 #----------------------------------------------------------------
-"""
 def uptime(self , mode = 0):
 "returns string containing how long server has been in operation"
 ut = time.time() - self.server_start_time
 d = int(ut/86400)
 h = int( (ut-(86400*d))/3600 )
 s = int( (ut-(86400*d)-(3600*h)-(60*m)) )
 uts =  str( "This server has been running for:\n " + str(d) + " days  " + str(h) + " hours  " + str(m) + " min. " + str(s) + " sec.  [" + str(int(ut)) + " seconds]")
 if mode == 0: print uts
 else: return uts
-"""
 #-----------------------------------------------------
 #  Toggle Room Password Allow  -- Added by Snowdog 11/03
 #-----------------------------------------------------
-"""
 def RoomPasswords(self):
 if self.allow_room_passwords != 0:
 self.allow_room_passwords = 0
 return "Client Created Room Passwords: Disallowed"
 else:
 self.allow_room_passwords = 1
 return "Client Created Room Passwords: Allowed"
 def group_dump(self,k):
 self.p_lock.acquire()
 try:
 print "Group: " + k
 print
 except Exception, e:
 self.log_msg(str(e))
 self.p_lock.release()
-"""
 #----------------------------------------------------------------
 #  Player List  -- Added by snowdog 4/03
 #----------------------------------------------------------------
-"""
 def player_list(self):
 "display a condensed list of players on the server"
 self.p_lock.acquire()
 try:
 print "------------[ PLAYER LIST ]------------"
 self.p_lock.acquire()
 try:
 keys = self.groups.keys()
 for k in keys:
 print "Group: %s  %s (pass: \"%s\")" % (str(k),self.groups[k].name, self.groups[k].pwd)
 ids = self.groups[k].get_player_ids()
 for id in ids:
-if self.players.has_key(id): print str(self.players[id])
+if self.players.has_key(id):
+print str(self.players[id])
 else:
 self.groups[k].remove_player(id)
 print "Bad Player Ref (#" + id + ") in group"
 except Exception, e:
 self.log_msg(str(e))
 self.p_lock.release()
 def update_request(self,newsock,xml_dom):
 # handle reconnects
 self.log_msg( "update_request() has been called." )
 # get player id
 id = xml_dom.getAttribute("id")
 group_id = xml_dom.getAttribute("group_id")
 self.p_lock.acquire()
 if self.players.has_key(id):
-self.sendMsg(newsock, self.players[id].toxml("update"),
+self.sendMsg( newsock, self.players[id].toxml("update"), self.players[id].useCompression, self.players[id].compressionType )
-self.players[id].useCompression,
-self.players[id].compressionType )
 self.players[id].reset(newsock)
 self.players[id].clear_timeout()
 need_new = 0
-else: need_new = 1
+else:
+need_new = 1
 self.p_lock.release()
-if need_new: self.new_request(newsock,xml_dom)
+if need_new:
+self.new_request(newsock,xml_dom)
 else:
 msg = self.groups[group_id].game_map.get_all_xml()
 self.send(msg,id,group_id)
 def new_request(self,newsock,xml_dom,LOBBY_ID='0'):
 #build client stub
 props = {}
 # Don't trust what the client tells us...trust what they connected as!
 props['ip'] = socket.gethostbyname( newsock.getpeername()[0] )
-try: props['role'] = xml_dom.getAttribute("role")
+try:
-except: props['role'] = "GM"
+props['role'] = xml_dom.getAttribute("role")
+except:
+props['role'] = "GM"
 props['name'] = xml_dom.getAttribute("name")
 props['group_id'] = LOBBY_ID
 props['id'] = str(self.next_player_id)
 props['version'] = xml_dom.getAttribute("version")
 props['protocol_version'] = xml_dom.getAttribute("protocol_version")
 props['client_string'] = xml_dom.getAttribute("client_string")
 self.next_player_id += 1
 new_stub = client_stub(self.incoming,newsock,props,self.log_console)
 if xml_dom.hasAttribute('useCompression'):
 new_stub.useCompression = True
 if xml_dom.hasAttribute('cmpType'):
 cmpType = xml_dom.getAttribute('cmpType')
-if cmpBZ2 and cmpType == 'bz2': new_stub.compressionType = bz2
+if cmpBZ2 and cmpType == 'bz2':
-elif cmpZLIB and cmpType == 'zlib': new_stub.compressionType = zlib
+new_stub.compressionType = bz2
-else: new_stub.compressionType = None
+elif cmpZLIB and cmpType == 'zlib':
-else: new_stub.compressionType = bz2
+new_stub.compressionType = zlib
-else: new_stub.useCompression = False
+else:
+new_stub.compressionType = None
+else:
+new_stub.compressionType = bz2
+else:
+new_stub.useCompression = False
 #update newly create client stub with network logging state
 new_stub.EnableMessageLogging = self.log_network_messages
 self.sendMsg(newsock, new_stub.toxml("new"), False, None)
 #  try to remove circular refs
 if xml_dom:
 xml_dom.unlink()
 time.sleep(2)
 newsock.close()
 print "Error in parse found from " + str(remote_host) + ".  Disconnected."
 print "  Offending data(" + str(len(data)) + "bytes)=" + data
 print "Exception=" + str(e)
-if xml_dom: xml_dom.unlink()
+if xml_dom:
+xml_dom.unlink()
 return
 #start threads and store player
 allowed = 1
 version_string = ""
 if ((props['protocol_version'] != PROTOCOL_VERSION) and self.validate_protocol):
 version_string = "Sorry, this server can't handle your client version. (Protocol mismatch)<br />"
 allowed = 0
 if not self.checkClientVersion(props['version']):
 version_string = "Sorry, your client is out of date. <br />"
-version_string += "This server requires your client be version "
+version_string += "This server requires your client be version " + self.minClientVersion + " or higher to connect.<br />"
-version_string += "" + self.minClientVersion + " or higher to connect.<br />"
 allowed = 0
 if not allowed:
-version_string += "  Please go to <a href='http://www.assembla.com/traipse'>"
+version_string += '  Please go to <a href="http://openrpg.digitalxero.net">http://openrpg.digitalxero.net</a> to find a compatible client.<br />'
-version_string += "http://www.assembla.com/traipse</a> to find a compatible client.<br />"
+version_string += "If you can't find a compatible client on the website, chances are that the server is running an unreleased development version for testing purposes.<br />"
-version_string += "If you can't find a compatible client on the website, "
-version_string += "chances are that the server is running an unreleased development "
-version_string += "version for testing purposes.<br />"
 self.sendMsg( newsock, "<msg to='" + props['id'] + "' from='0' group_id='0' />" + version_string, new_stub.useCompression, new_stub.compressionType)
 #  Give messages time to flow
 time.sleep(1)
 self.log_msg("Connection terminating due to version incompatibility with client (ver: " + props['version'] + "  protocol: " + props['protocol_version'] + ")" )
 if self.ban_list.has_key(ip):
 banmsg = "You have been banned from this server.<br />"
 cmsg = "Banned Client: (" + str(props['id']) + ") " + str(props['name']) + " [" + str(props['ip']) + "]"
 self.log_msg(cmsg)
 allowed = 0
 self.sendMsg( newsock, "<msg to='" + props['id'] + "' from='0' group_id='0' />" + banmsg, new_stub.useCompression, new_stub.compressionType)
 #  Give messages time to flow
 time.sleep(1)
 newsock.close()
 if xml_dom:
 xml_dom.unlink()
 return None
-"""
 #---- Connection order changed by Snowdog 1/05
 #---- Attempt to register player and send group data
 #---- before displaying lobby message
 #---- Does not solve the Blackhole bug but under some conditions may
 #---- allow for a graceful server response. -SD
 #---- changed method of sending group names to user 8/05
 #---- black hole bug causes the group information to not be sent
 #---- to clients. Not sure why the group messages were being sent to the
 #---- incomming message queue, when they should be sent directly to user
 #---- Does not solve the black hole bug totally -SD
-"""
 try:
 if xml_dom.getAttribute("id") == props['id']:
 new_stub.initialize_threads()
 self.p_lock.acquire()
 self.players[props['id']] = new_stub
 self.groups[LOBBY_ID].add_player(props['id']) #always add to lobby on connection.
 self.send_group_list(props['id'])
 self.send_player_list(props['id'],LOBBY_ID)
 self.p_lock.release()
 msg = self.groups[LOBBY_ID].game_map.get_all_xml()
 self.send(msg,props['id'],LOBBY_ID)
 self.send_to_group(props['id'],LOBBY_ID,self.players[props['id']].toxml('new'))
 self.return_room_roles(props['id'],LOBBY_ID)
 # Re-initialize the role for this player incase they came from a different server
 self.handle_role("set",props['id'], "GM",self.groups[LOBBY_ID].boot_pwd, LOBBY_ID)
 cmsg = "Client Connect: (" + str(props['id']) + ") " + str(props['name']) + " [" + str(props['ip']) + "]"
 self.log_msg(cmsg)
 cmsg = ("connect", props) #################################################
 self.log_msg(cmsg)
 err_string += "please contact the servers administrator to correct the issue.</center> "
 self.sendMsg( newsock, "<msg to='" + props['id'] + "' from='" + props['id'] + "' group_id='0' />" + err_string, new_stub.useCompression, new_stub.compressionType )
 time.sleep(2)
 newsock.close()
 #  Display the lobby message
 self.SendLobbyMessage(newsock,props['id'])
 if xml_dom:
 xml_dom.unlink()
 def checkClientVersion(self, clientversion):
 minv = self.minClientVersion.split('.')
 cver = clientversion.split('.')
 for i in xrange(min(len(minv),len(cver))):
 w=max(len(minv[i]),len(cver[i]))
 v1=minv[i].rjust(w);
 v2=cver[i].rjust(w);
-if v1<v2: return 1
+if v1<v2:
-if v1>v2: return 0
+return 1
-if len(minv)>len(cver): return 0
+if v1>v2:
+return 0
+if len(minv)>len(cver):
+return 0
 return 1
 def SendLobbyMessage(self, socket, player_id):
-"""
+#######################################################################
 #  Display the lobby message
 #  prepend this server's version string to the the lobby message
-"""
+try:
-try:
+lobbyMsg = "You have connected to an <a href=\"http://www.openrpg.com\">OpenRPG</a> server, version '" + VERSION + "'"
-lobbyMsg = "You have connected to an <a href=\"http://www.openrpg.com\">OpenRPG</a> "
-lobbyMsg += "server, version '" + VERSION + "'"
 # See if we have a server name to report!
 if len(self.serverName):
 lobbyMsg += ", named '" + self.serverName + "'."
 else:
 lobbyMsg += "."
 # Add extra line spacing
 lobbyMsg += "\n\n"
-try: validate.config_file("LobbyMessage.html","default_LobbyMessage.html")
+try:
-except: pass
+validate.config_file("LobbyMessage.html","default_LobbyMessage.html")
+except:
+pass
 else:
 open_msg = open( self.userPath + "LobbyMessage.html", "r" )
 lobbyMsg += open_msg.read()
 open_msg.close()
 # Send the server's lobby message to the client no matter what
-self.sendMsg(socket, "<msg to='" + player_id + "' from='0' group_id='0' />" + lobbyMsg,
+self.sendMsg(socket, "<msg to='" + player_id + "' from='0' group_id='0' />" + lobbyMsg, self.players[player_id].useCompression, self.players[player_id].compressionType)
-self.players[player_id].useCompression, self.players[player_id].compressionType)
 if self.sendLobbySound:
-self.sendMsg(socket, '<sound url="' + self.lobbySound + '" group_id="0" from="0" loop="True" />',
+self.sendMsg(socket, '<sound url="' + self.lobbySound + '" group_id="0" from="0" loop="True" />', self.players[player_id].useCompression, self.players[player_id].compressionType)
-self.players[player_id].useCompression, self.players[player_id].compressionType)
 return
-except: traceback.print_exc()
+except:
-"""
+traceback.print_exc()
 #  End of lobby message code
-"""
+#######################################################################
 def listenAcceptThread(self,arg):
 #  Set up the socket to listen on.
 try:
 self.log_msg("\nlisten thread running...")
 adder = ""
-if self.server_address is not None: adder = self.server_address
+if self.server_address is not None:
+adder = self.server_address
 self.listen_sock.bind(('', self.server_port))
 self.listen_sock.listen(5)
 except Exception, e:
 self.log_msg(("Error binding request socket!", e))
 self.alive = 0
 while self.alive:
 #  Block on the socket waiting for a new connection
 try:
 (newsock, addr) = self.listen_sock.accept()
-"""
 ## self.log_msg("New connection from " + str(addr)+ ". Interfacing with server...")
 # Now that we've accepted a new connection, we must immediately spawn a new
 # thread to handle it...otherwise we run the risk of having a DoS shoved into
 # our face!  :O  After words, this thread is dead ready for another connection
 # accept to come in.
-"""
 thread.start_new_thread(self.acceptedNewConnectionThread, ( newsock, addr ))
 except:
 print "The following exception caught accepting new connection:"
 traceback.print_exc()
 #  At this point, we're done and cleaning up.
 self.log_msg("server socket listening thread exiting...")
 self.listen_event.set()
 def acceptedNewConnectionThread( self, newsock, addr ):
 """Once a new connection comes in and is accepted, this thread starts up to handle it."""
 # Initialize xml_dom
 xml_dom = None
 data = None
 # get client info and send othe client info
 # If this receive fails, this thread should exit without even attempting to process it
 self.log_msg("Connection from " + str(addr) + " has been accepted.  Waiting for data...")
 data = self.recvMsg( newsock )
 if data=="" or data == None:
 self.log_msg("Connection from " + str(addr) + " failed. Closing connection.")
-try: newsock.close()
+try:
+newsock.close()
 except Exception, e:
 self.log_msg( str(e) )
 print str(e)
 return #returning causes connection thread instance to terminate
 if data == "<system/>":
-try: newsock.close()
+try:
-except: pass
+newsock.close()
+except:
+pass
 return #returning causes connection thread instance to terminate
 #  Clear out the xml_dom in preparation for new stuff, if necessary
 try:
-if xml_dom: xml_dom.unlink()
+if xml_dom:
+xml_dom.unlink()
 except:
 self.log_msg( "The following exception caught unlinking xml_dom:")
 self.log_msg("Continuing")
-try: newsock.close()
-except: pass
+try:
+newsock.close()
+except:
+pass
 return #returning causes connection thread instance to terminate
 #  Parse the XML received from the connecting client
 try:
 xml_dom = parseXml(data)
 xml_dom = xml_dom._get_documentElement()
 except:
-try: newsock.close()
+try:
-except: pass
+newsock.close()
+except:
+pass
 self.log_msg( "Error in parse found from " + str(addr) + ".  Disconnected.")
 self.log_msg("  Offending data(" + str(len(data)) + "bytes)=" + data)
 self.log_msg( "Exception:")
 traceback.print_exc()
 return #returning causes connection thread instance to terminate
 try:
 # get action
 action = xml_dom.getAttribute("action")
 # Figure out what type of connection we have going on now
-if action == "new": self.new_request(newsock,xml_dom)
+if action == "new":
-elif action == "update": self.update_request(newsock,xml_dom)
+self.new_request(newsock,xml_dom)
-else: self.log_msg("Unknown Join Request!")
+elif action == "update":
+self.update_request(newsock,xml_dom)
+else:
+self.log_msg("Unknown Join Request!")
 except Exception, e:
 print "The following  message: " + str(data)
 print "from " + str(addr) + " created the following exception: "
 traceback.print_exc()
 return #returning causes connection thread instance to terminate
 #  Again attempt to clean out DOM stuff
 try:
-if xml_dom: xml_dom.unlink()
+if xml_dom:
+xml_dom.unlink()
 except:
 print "The following exception caught unlinking xml_dom:"
 traceback.print_exc()
 return #returning causes connection thread instance to terminate
-"""
 #========================================================
 #
 #   Message_handler
 #
 #========================================================
 #
 # Changed thread organization from one continuous parsing/handling thread
 # to multiple expiring parsing/handling threads to improve server performance
 # and player load capacity -- Snowdog 3/04
-"""
 def message_handler(self,arg):
 xml_dom = None
 self.log_msg( "message handler thread running..." )
 while self.alive:
 data = None
-try: data=self.incoming.get(0)
+try:
+data=self.incoming.get(0)
 except Queue.Empty:
 time.sleep(0.5) #sleep 1/2 second
 continue
 bytes = len(data)
-if bytes <= 0: continue
+if bytes <= 0:
+continue
 try:
 thread.start_new_thread(self.parse_incoming_dom,(str(data),))
 #data has been passed... unlink from the variable references
 #so data in passed objects doesn't change (python passes by reference)
 del data
 except Exception, e:
 print "Error in parse of inbound message. Ignoring message."
 print "  Offending data(" + str(len(data)) + "bytes)=" + data
 print "Exception=" + str(e)
 if xml_dom: xml_dom.unlink()
 def message_action(self, xml_dom, data):
 tag_name = xml_dom._get_tagName()
-if self.svrcmds.has_key(tag_name): self.svrcmds[tag_name]['function'](xml_dom,data)
+if self.svrcmds.has_key(tag_name):
-else: raise Exception, "Not a valid header!"
+self.svrcmds[tag_name]['function'](xml_dom,data)
+else:
+raise Exception, "Not a valid header!"
 #Message Action thread expires and closes here.
 return
 def do_alter(self, xml_dom, data):
 target = xml_dom.getAttribute("key")
 value = xml_dom.getAttribute("val")
 player = xml_dom.getAttribute("plr")
 group_id = xml_dom.getAttribute("gid")
 boot_pwd = xml_dom.getAttribute("bpw")
 actual_boot_pwd = self.groups[group_id].boot_pwd
 if self.allow_room_passwords == 0:
-msg ="<msg to='" + player + "' from='0' group_id='0' /> "
+msg ="<msg to='" + player + "' from='0' group_id='0' /> Room passwords have been disabled by the server administrator."
-msg += "Room passwords have been disabled by the server administrator."
 self.players[player].outbox.put(msg)
 return
 elif boot_pwd == actual_boot_pwd:
 if target == "pwd":
-lmessage = "Room password changed to from " + self.groups[group_id].pwd + " to " + value  + " by " + player
+lmessage = "Room password changed to from \"" + self.groups[group_id].pwd + "\" to \"" + value  + "\" by " + player
 self.groups[group_id].pwd = value
-msg ="<msg to='" + player + "' from='0' group_id='0' /> Room password changed to " +  value + "."
+msg ="<msg to='" + player + "' from='0' group_id='0' /> Room password changed to \"" +  value + "\"."
 self.players[player].outbox.put(msg)
 self.log_msg(lmessage)
 self.send_to_all('0',self.groups[group_id].toxml('update'))
 elif target == "name":
 # Check for & in name.  We want to allow this because of its common
 msg ="<msg to='" + player + "' from='0' group_id='0' />" + result
 self.players[player].outbox.put(msg)
 else:
 msg ="<msg to='" + player + "' from='0' group_id='0'>Invalid Administrator Password."
 self.players[player].outbox.put(msg)
 def do_role(self, xml_dom, data):
 role = ""
 boot_pwd = ""
 act = xml_dom.getAttribute("action")
 def do_ping(self, xml_dom, data):
 player = xml_dom.getAttribute("player")
 group_id = xml_dom.getAttribute("group_id")
 sent_time = ""
 msg = ""
-try: sent_time = xml_dom.getAttribute("time")
+try:
-except: pass
+sent_time = xml_dom.getAttribute("time")
-if sent_time != "": msg ="<ping time='" + str(sent_time) + "' />" #because a time was sent return a ping response
+except:
+pass
+if sent_time != "":
+#because a time was sent return a ping response
+msg ="<ping time='" + str(sent_time) + "' />"
 else:
-msg ="<msg to='" + player + "' from='" + player + "' group_id='" + group_id + "'>"
+msg ="<msg to='" + player + "' from='" + player + "' group_id='" + group_id + "'><font color='#FF0000'>PONG!?!</font>"
-msg += "<font color='#FF0000'>PONG!?!</font>"
 self.players[player].outbox.put(msg)
 xml_dom.unlink()
 def do_system(self, xml_dom, data):
 pass
 def moderate_group(self,xml_dom,data):
 try:
 action = xml_dom.getAttribute("action")
 from_id = xml_dom.getAttribute("from")
-if xml_dom.hasAttribute("pwd"): pwd=xml_dom.getAttribute("pwd")
+if xml_dom.hasAttribute("pwd"):
-else: pwd=""
+pwd=xml_dom.getAttribute("pwd")
+else:
+pwd=""
 group_id=self.players[from_id].group_id
 if action == "list":
 if (self.groups[group_id].moderated):
 msg = ""
 for i in self.groups[group_id].voice.keys():
-if msg != "": msg +=", "
+if msg != "":
-if self.players.has_key(i): msg += '('+i+') '+self.players[i].name
+msg +=", "
-else: del self.groups[group_id].voice[i]
+if self.players.has_key(i):
-if (msg != ""): msg = "The following users may speak in this room: " + msg
+msg += '('+i+') '+self.players[i].name
-else: msg = "No people are currently in this room with the ability to chat"
+else:
+del self.groups[group_id].voice[i]
+if (msg != ""):
+msg = "The following users may speak in this room: " + msg
+else:
+msg = "No people are currently in this room with the ability to chat"
 self.players[from_id].self_message(msg)
-else: self.players[from_id].self_message("This room is currently unmoderated")
+else:
-elif action == 'enable' or 'disable' or 'addvoice' or 'delvoice':
+self.players[from_id].self_message("This room is currently unmoderated")
-#condenses password check --TaS 2009
+elif action == "enable":
 if not self.groups[group_id].check_boot_pwd(pwd):
 self.players[from_id].self_message("Failed - incorrect admin password")
 return
-if action == 'enable':
+self.groups[group_id].moderated = 1
-self.groups[group_id].moderated = 1
+self.players[from_id].self_message("This channel is now moderated")
-self.players[from_id].self_message("This channel is now moderated")
+elif action == "disable":
-if action == 'disable':
+if not self.groups[group_id].check_boot_pwd(pwd):
-self.groups[group_id].moderated = 0
+self.players[from_id].self_message("Failed - incorrect admin password")
-self.players[from_id].self_message("This channel is now unmoderated")
+return
-if action == 'addvoice':
+self.groups[group_id].moderated = 0
-users = xml_dom.getAttribute("users").split(',')
+self.players[from_id].self_message("This channel is now unmoderated")
-for i in users: self.groups[group_id].voice[i.strip()]=1
+elif action == "addvoice":
-if action == 'delvoice':
+if not self.groups[group_id].check_boot_pwd(pwd):
-users = xml_dom.getAttribute("users").split(',')
+self.players[from_id].self_message("Failed - incorrect admin password")
-for i in users:
+return
-if self.groups[group_id].voice.has_key(i.strip()): del self.groups[group_id].voice[i.strip()]
+users = xml_dom.getAttribute("users").split(',')
+for i in users:
+self.groups[group_id].voice[i.strip()]=1
+elif action == "delvoice":
+if not self.groups[group_id].check_boot_pwd(pwd):
+self.players[from_id].self_message("Failed - incorrect admin password")
+return
+users = xml_dom.getAttribute("users").split(',')
+for i in users:
+if self.groups[group_id].voice.has_key(i.strip()):
+del self.groups[group_id].voice[i.strip()]
 else:
 print "Bad input: " + data
 except Exception,e:
 self.log_msg(str(e))
 def join_group(self,xml_dom,data):
 try:
 from_id = xml_dom.getAttribute("from")
 pwd = xml_dom.getAttribute("pwd")
 allowed = 0
 #tell the clients password manager the password failed -- SD 8/03
 pm = "<password signal=\"fail\" type=\"room\" id=\"" +  group_id  + "\" data=\"\"/>"
 self.players[from_id].outbox.put(pm)
 msg = 'failed - incorrect room password'
 if not allowed:
 self.players[from_id].self_message(msg)
 #the following line makes sure that their role is reset to normal,
 self.players[from_id].outbox.put(msg)
 return
 #move the player into their new group.
 self.move_player(from_id, group_id)
 except Exception, e:
 self.log_msg(str(e))
-"""
+#----------------------------------------------------------------------------
 # move_player function -- added by Snowdog 4/03
 #
 # Split join_group function in half. separating the player validation checks
 # from the actual group changing code. Done primarily to impliment
 # boot-from-room-to-lobby behavior in the server.
-"""
 def move_player(self, from_id, group_id ):
 "move a player from one group to another"
 try:
 try:
 old_group_id = self.players[from_id].change_group(group_id,self.groups)
 self.send_to_group(from_id,old_group_id,self.players[from_id].toxml('del'))
 self.send_to_group(from_id,group_id,self.players[from_id].toxml('new'))
 self.check_group(from_id, old_group_id)
-"""
 # Here, if we have a group specific lobby message to send, push it on
 # out the door!  Make it put the message then announce the player...just
 # like in the lobby during a new connection.
 # -- only do this check if the room id is within range of known persistent id thresholds
 #also goes ahead if there is a defaultRoomMessage --akoman
-"""
 if self.isPersistentRoom(group_id) or self.defaultMessageFile != None:
 try:
 if self.groups[group_id].messageFile[:4] == 'http':
 data = urllib.urlretrieve(self.groups[group_id].messageFile)
 roomMsgFile = open(data[0])
-else: roomMsgFile = open(self.groups[group_id].messageFile, "r")
+else:
+roomMsgFile = open(self.groups[group_id].messageFile, "r")
 roomMsg = roomMsgFile.read()
 roomMsgFile.close()
 urllib.urlcleanup()
 except Exception, e:
 roomMsg = ""
 self.log_msg(str(e))
 # Spit that darn message out now!
 self.players[from_id].outbox.put("<msg to='" + from_id + "' from='0' group_id='" + group_id + "' />" + roomMsg)
 if self.sendLobbySound and group_id == '0':
 self.players[from_id].outbox.put('<sound url="' + self.lobbySound + '" group_id="0" from="0" loop="True" />')
 # Now, tell everyone that we've arrived
 self.send_to_all('0', self.groups[group_id].toxml('update'))
 # this line sends a handle role message to change the players role
 self.send_player_list(from_id,group_id)
 #notify user about others in the room
 self.return_room_roles(from_id,group_id)
 self.log_msg(("join_group", (self.groups[group_id].name, group_id, from_id)))
 self.handle_role("set", from_id, self.players[from_id].role, self.groups[group_id].boot_pwd, group_id)
 except Exception, e:
 self.log_msg(str(e))
 thread.start_new_thread(self.registerRooms,(0,))
 def return_room_roles(self,from_id,group_id):
 for m in self.players.keys():
 if self.players[m].group_id == group_id:
 msg = "<role action=\"update\" id=\"" + self.players[m].id  + "\" role=\"" + self.players[m].role + "\" />"
 self.players[from_id].outbox.put(msg)
-"""
 # This is pretty much the same thing as the create_group method, however,
 # it's much more generic whereas the create_group method is tied to a specific
 # xml message.  Ack!  This version simply creates the groups, it does not
 # send them to players.  Also note, both these methods have race
 # conditions written all over them.  Ack! Ack!
-"""
 def new_group( self, name, pwd, boot, minVersion, mapFile, messageFile, persist = 0, moderated=0 ):
 group_id = str( self.next_group_id )
 self.next_group_id += 1
 self.groups[group_id] = game_group( group_id, name, pwd, "", boot, minVersion, mapFile, messageFile, persist )
 self.groups[group_id].moderated = moderated
 if persist !=0: ins="Persistant "
 lmsg = "Creating " + ins + "Group... (" + str(group_id) + ") " + str(name)
 self.log_msg( lmsg )
 self.log_msg(("create_group", (str(name), int(group_id), 0) )) ##-99 works, could be better.
 def change_group_name(self,gid,name,pid):
 "Change the name of a group"
 # Check for & in name.  We want to allow this because of its common
 # use in d&d games.
 try:
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 value = b + "&amp;" + e
 oldloc = loc+1
 loc = name.find("'")
 oldloc = 0
 while loc > -1:
 loc = name.find("'",oldloc)
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 name = b + "&#39;" + e
 oldloc = loc+1
 loc = name.find('"')
 oldloc = 0
 while loc > -1:
 loc = name.find('"',oldloc)
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 name = b + "&quot;" + e
 oldloc = loc+1
 oldroomname = self.groups[gid].name
 self.groups[gid].name = str(name)
 lmessage = "Room name changed to from \"" + oldroomname + "\" to \"" + name + "\""
 self.log_msg(lmessage  + " by " + str(pid) )
 self.send_to_all('0',self.groups[gid].toxml('update'))
 return lmessage
-except: return "An error occured during rename of room!"
+except:
+return "An error occured during rename of room!"
 thread.start_new_thread(self.registerRooms,(0,))
 def create_group(self,xml_dom,data):
 try:
 from_id = xml_dom.getAttribute("from")
 pwd = xml_dom.getAttribute("pwd")
 messageFile = self.defaultMessageFile
 # see if passwords are allowed on this server and null password if not
 if self.allow_room_passwords != 1: pwd = ""
+#
 # Check for & in name.  We want to allow this because of its common
 # use in d&d games.
 loc = name.find("&")
 oldloc = 0
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 name = b + "&amp;" + e
 oldloc = loc+1
 loc = name.find("'")
 oldloc = 0
 while loc > -1:
 loc = name.find("'",oldloc)
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 name = b + "&#39;" + e
 oldloc = loc+1
 loc = name.find('"')
 oldloc = 0
 while loc > -1:
 loc = name.find('"',oldloc)
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 name = b + "&quot;" + e
 oldloc = loc+1
 group_id = str(self.next_group_id)
 self.next_group_id += 1
 self.groups[group_id] = game_group(group_id,name,pwd,"",boot_pwd, minVersion, None, messageFile )
 self.groups[group_id].voice[from_id]=1
 self.players[from_id].outbox.put(self.groups[group_id].toxml('new'))
 if self.defaultMessageFile != None:
 if self.defaultMessageFile[:4] == 'http':
 data = urllib.urlretrieve(self.defaultMessageFile)
 open_msg = open(data[0])
 urllib.urlcleanup()
-else: open_msg = open( self.defaultMessageFile, "r" )
+else:
+open_msg = open( self.defaultMessageFile, "r" )
 roomMsg = open_msg.read()
 open_msg.close()
 # Send the rooms message to the client no matter what
 self.players[from_id].outbox.put( "<msg to='" + from_id + "' from='0' group_id='" + group_id + "' />" + roomMsg )
-except Exception, e: self.log_msg( "Exception: create_group(): " + str(e))
+except Exception, e:
+self.log_msg( "Exception: create_group(): " + str(e))
 thread.start_new_thread(self.registerRooms,(0,))
 def check_group(self, from_id, group_id):
 try:
 if group_id not in self.groups: return
 if group_id == '0':
 return #never remove lobby *sanity check*
 if not self.isPersistentRoom(group_id)  and self.groups[group_id].get_num_players() == 0:
 self.send_to_all("0",self.groups[group_id].toxml('del'))
 del self.groups[group_id]
 self.log_msg(("delete_group", (group_id, from_id)))
-else: self.send_to_all("0",self.groups[group_id].toxml('update'))
+else:
+self.send_to_all("0",self.groups[group_id].toxml('update'))
 #The register Rooms thread
 thread.start_new_thread(self.registerRooms,(0,))
-except Exception, e: self.log_msg(str(e))
+except Exception, e:
+self.log_msg(str(e))
 def del_player(self,id,group_id):
 try:
 dmsg = "Client Disconnect: (" + str(id) + ") " + str(self.players[id].name)
 self.players[id].disconnect()
 self.groups[group_id].remove_player(id)
 del self.players[id]
 self.log_msg(dmsg)
 self.log_msg(("disconnect",id))
-"""
 #  If already registered then re-register, thereby updating the Meta
 #    on the number of players
 #  Note:  Upon server shutdown, the server is first unregistered, so
 #           this code won't be repeated for each player being deleted.
-"""
 if self.be_registered:
 self.register()
-except Exception, e: self.log_msg(str(e))
+except Exception, e:
+self.log_msg(str(e))
 self.log_msg("Explicit garbage collection shows %s undeletable items." % str(gc.collect()))
 def incoming_player_handler(self,xml_dom,data):
 id = xml_dom.getAttribute("id")
 act = xml_dom.getAttribute("action")
 #group_id = xml_dom.getAttribute("group_id")
 group_id = self.players[id].group_id
 ip = self.players[id].ip
 self.log_msg("Player with IP: " + str(ip) + " joined.")
 ServerPlugins.setPlayer(self.players[id])
 self.send_to_group(id,group_id,data)
 if act=="new":
 try:
 self.send_player_list(id,group_id)
 self.send_group_list(id)
-except Exception, e: traceback.print_exc()
+except Exception, e:
+traceback.print_exc()
 elif act=="del":
 #print "del player"
 self.del_player(id,group_id)
 self.check_group(id, group_id)
 elif act=="update":
 				     "boot": xml_dom.getAttribute("rm_boot"),
 				     "version": xml_dom.getAttribute("version"),
 				     "ping": xml_dom.getAttribute("time") \
 }))
 def strip_cheat_roll(self, string):
 try:
 cheat_regex = re.compile('&amp;#91;(.*?)&amp;#93;')
 string = cheat_regex.sub( r'[ ' + self.cheat_msg + " \\1 " + self.cheat_msg + ' ]', string)
-except: pass
+except:
+pass
 return string
 def strip_body_tags(self, string):
 try:
 bodytag_regex = re.compile('&lt;\/?body(.*?)&gt;')
 string = bodytag_regex.sub('', string)
-except: pass
+except:
+pass
 return string
 def msgTooLong(self, length):
-if length > self.maxSendSize and not self.maxSendSize == 0: return True
+if length > self.maxSendSize and not self.maxSendSize == 0:
+return True
 return False
 def incoming_msg_handler(self,xml_dom,data):
 xml_dom, data = ServerPlugins.preParseIncoming(xml_dom, data)
 to_id = xml_dom.getAttribute("to")
 from_id = xml_dom.getAttribute("from")
 group_id = xml_dom.getAttribute("group_id")
 end = data.find(">")
 msg = data[end+1:]
 if from_id == "0" or len(from_id) == 0:
 print "WARNING!! Message received with an invalid from_id.  Message dropped."
 return None
-""" check for < body to prevent someone from changing the background"""
+#
+# check for < body to prevent someone from changing the background
+#
 data = self.strip_body_tags(data)
-"""check for &#91 and &#93  codes which are often used to cheat with dice."""
+#
+# check for &#91 and &#93  codes which are often used to cheat with dice.
+#
 if self.players[from_id].role != "GM":
 data = self.strip_cheat_roll(data)
 if group_id == '0' and self.msgTooLong(len(msg) and msg[:5] == '<chat'):
 self.send("Your message was too long, break it up into smaller parts please", from_id, group_id)
 else:
 if to_id == 'all':
 if self.groups[group_id].moderated and not self.groups[group_id].voice.has_key(from_id):
 self.players[from_id].self_message('This room is moderated - message not sent to others')
-else: self.send_to_group(from_id,group_id,data)
+else:
-else: self.players[to_id].outbox.put(data)
+self.send_to_group(from_id,group_id,data)
+else:
+self.players[to_id].outbox.put(data)
 self.check_group_members(group_id)
 return
 def sound_msg_handler(self, xml_dom, data):
 from_id = xml_dom.getAttribute("from")
 group_id = xml_dom.getAttribute("group_id")
-if group_id != 0: self.send_to_group(from_id, group_id, data)
+if group_id != 0:
+self.send_to_group(from_id, group_id, data)
 def plugin_msg_handler(self,xml_dom,data):
 to_id = xml_dom.getAttribute("to")
 from_id = xml_dom.getAttribute("from")
 group_id = xml_dom.getAttribute("group_id")
 msg = data[end+1:]
 if from_id == "0" or len(from_id) == 0:
 print "WARNING!! Message received with an invalid from_id.  Message dropped."
 return None
 if to_id == 'all':
 if self.groups[group_id].moderated and not self.groups[group_id].voice.has_key(from_id):
 self.players[from_id].self_message('This room is moderated - message not sent to others')
-else: self.send_to_group(from_id, group_id, msg)
+else:
-else: self.players[to_id].outbox.put(msg)
+self.send_to_group(from_id, group_id, msg)
+else:
+self.players[to_id].outbox.put(msg)
 self.check_group_members(group_id)
 return
 def handle_role(self, act, player, role, given_boot_pwd, group_id):
 if act == "display":
 msg = "<msg to=\"" + player + "\" from=\"0\" group_id=\"" + group_id + "\" />"
 msg += "Displaying Roles<br /><br /><u>Role</u>&nbsp&nbsp&nbsp<u>Player</u><br />"
 keys = self.players.keys()
 for m in keys:
-if self.players[m].group_id == group_id: msg += self.players[m].role + " " + self.players[m].name + "<br />"
+if self.players[m].group_id == group_id:
+msg += self.players[m].role + " " + self.players[m].name + "<br />"
 self.send(msg,player,group_id)
 elif act == "set":
 try:
 actual_boot_pwd = self.groups[group_id].boot_pwd
 if self.players[player].group_id == group_id:
 #  Send update role event to all
 msg = "<role action=\"update\" id=\"" + player  + "\" role=\"" + role + "\" />"
 self.send_to_group("0", group_id, msg)
 self.players[player].role = role
-if (role.lower() == "gm" or role.lower() == "player"): self.groups[group_id].voice[player]=1
+if (role.lower() == "gm" or role.lower() == "player"):
+self.groups[group_id].voice[player]=1
 else:
 #tell the clients password manager the password failed -- SD 8/03
 pm = "<password signal=\"fail\" type=\"admin\" id=\"" + group_id + "\" data=\"\"/>"
 self.players[player].outbox.put(pm)
 self.log_msg( "Administrator passwords did not match")
 traceback.print_exc()
 try:
 actual_boot_pwd = self.groups[group_id].boot_pwd
 server_admin_pwd = self.groups["0"].boot_pwd
 self.log_msg("Actual boot pwd = " + actual_boot_pwd)
 self.log_msg("Given boot pwd = " + given_boot_pwd)
 if self.players[to_id].group_id == group_id:
-"""
 ### ---CHANGES BY SNOWDOG 4/03 ---
 ### added boot to lobby code.
 ### if boot comes from lobby dump player from the server
 ### any user in-room boot will dump to lobby instead
-"""
 if given_boot_pwd == server_admin_pwd:
 # Send a message to everyone in the room, letting them know someone has been booted
 boot_msg = "<msg to='all' from='%s' group_id='%s'/><font color='#FF0000'>Booting '(%s) %s' from server...</font>" % (from_id, group_id, to_id, self.players[to_id].name)
 self.log_msg("boot_msg:" + boot_msg)
 self.send_to_group( "0", group_id, boot_msg )
 time.sleep( 1 )
 self.log_msg("Booting player " + str(to_id) + " from server.")
 #  Send delete player event to all
 self.send_to_group("0",group_id,self.players[to_id].toxml("del"))
 self.check_group(to_id, group_id)
 elif actual_boot_pwd == given_boot_pwd:
 # Send a message to everyone in the room, letting them know someone has been booted
 boot_msg = "<msg to='all' from='%s' group_id='%s'/><font color='#FF0000'>Booting '(%s) %s' from room...</font>" % (from_id, group_id, to_id, self.players[to_id].name)
 self.log_msg("boot_msg:" + boot_msg)
 self.send_to_group( "0", group_id, boot_msg )
 time.sleep( 1 )
 #dump player into the lobby
 self.move_player(to_id,"0")
 traceback.print_exc()
 self.log_msg('Exception in handle_boot() ' + str(e))
 finally:
 try:
-if xml_dom: xml_dom.unlink()
+if xml_dom:
+xml_dom.unlink()
 except Exception, e:
 traceback.print_exc()
 self.log_msg('Exception in xml_dom.unlink() ' + str(e))
-"""
+#---------------------------------------------------------------
 # admin_kick function -- by Snowdog 4/03
 # 9/17/05 updated to allow stealth boots (no client chat announce) -SD
-"""
+#---------------------------------------------------------------
 def admin_kick(self, id, message="", silent = 0 ):
 "Kick a player from a server from the console"
 try:
 group_id = self.players[id].group_id
 # Send a message to everyone in the victim's room, letting them know someone has been booted
 boot_msg = "<msg to='all' from='0' group_id='%s'/><font color='#FF0000'>Kicking '(%s) %s' from server... %s</font>" % ( group_id, id, self.players[id].name, str(message))
 self.log_msg("boot_msg:" + boot_msg)
-if (silent == 0): self.send_to_group( "0", group_id, boot_msg )
+if (silent == 0):
+self.send_to_group( "0", group_id, boot_msg )
 time.sleep( 1 )
 self.log_msg("kicking player " + str(id) + " from server.")
 #  Send delete player event to all
 self.send_to_group("0",group_id,self.players[id].toxml("del"))
 self.check_group(id, group_id)
 except Exception, e:
 traceback.print_exc()
 self.log_msg('Exception in admin_kick() ' + str(e))
 def admin_banip(self, ip, name="", silent = 0):
 "Ban a player from a server from the console"
 try:
 self.ban_list[ip] = {}
 traceback.print_exc()
 self.log_msg('Exception in admin_ban() ' + str(e))
 def admin_unban(self, ip):
 try:
-if self.ban_list.has_key(ip): del self.ban_list[ip]
+if self.ban_list.has_key(ip):
+del self.ban_list[ip]
 self.saveBanList()
 except Exception, e:
 traceback.print_exc()
 self.log_msg('Exception in admin_unban() ' + str(e))
 msg.append(self.ban_list[ip]['name'])
 msg.append("</td><td>")
 msg.append(self.ban_list[ip]['ip'])
 msg.append("</td></tr>")
 msg.append("</table>")
 return "".join(msg)
 def admin_toggleSound(self):
-if self.sendLobbySound: self.sendLobbySound = False
+if self.sendLobbySound:
-else: self.sendLobbySound = True
+self.sendLobbySound = False
+else:
+self.sendLobbySound = True
 return self.sendLobbySound
 def admin_soundFile(self, file):
 self.lobbySound = file
 return "Invalid Room Id. Ignoring remove request."
 self.groups[group].persistant = 0
 try:
 keys = self.groups[group].get_player_ids()
-for k in keys: self.del_player(k, str(group))
+for k in keys:
+self.del_player(k, str(group))
 self.check_group("0", str(group))
-except: pass
+except:
+pass
 def send(self,msg,player,group):
 self.players[player].send(msg,player,group)
 def send_to_all(self,from_id,data):
 try:
 print data
 self.p_lock.acquire()
 keys = self.players.keys()
 self.p_lock.release()
 for k in keys:
-if k != from_id: self.players[k].outbox.put(data)
+if k != from_id:
+self.players[k].outbox.put(data)
 except Exception, e:
 traceback.print_exc()
 self.log_msg("Exception: send_to_all(): " + str(e))
 def send_to_group(self, from_id, group_id, data):
 try:
 self.p_lock.acquire()
 keys = self.groups[group_id].get_player_ids()
 self.p_lock.release()
 for k in keys:
-if k != from_id: self.players[k].outbox.put(data)
+if k != from_id:
+self.players[k].outbox.put(data)
 except Exception, e:
 traceback.print_exc()
 self.log_msg("Exception: send_to_group(): " + str(e))
 def send_player_list(self,to_id,group_id):
 self.players[to_id].outbox.put(xml)
 except Exception, e:
 self.log_msg("Exception: send_group_list(): (client #"+to_id+") : " + str(e))
 traceback.print_exc()
-"""
+#--------------------------------------------------------------------------
 # KICK_ALL_CLIENTS()
 #
 # Convience method for booting all clients off the server at once.
 # used while troubleshooting mysterious "black hole" server bug
 # Added by Snowdog 11-19-04
-"""
 def kick_all_clients(self):
 try:
 keys = self.groups.keys()
 for k in keys:
 pl = self.groups[k].get_player_ids()
-for p in pl: self.admin_kick(p,"Purged from server")
+for p in pl:
+self.admin_kick(p,"Purged from server")
 except Exception, e:
 traceback.print_exc()
 self.log_msg("Exception: kick_all_clients(): " + str(e))
-"""
 # This really has little value as it will only catch people that are hung
 # on a disconnect which didn't complete.  Other idle connections which are
 # really dead go undeterred.
 #
 # UPDATED 11-29-04: Changed remove XML send to forced admin_kick for 'dead clients'
 #                   Dead clients now removed more effeciently as soon as they are detected
 #                        --Snowdog
-"""
 def check_group_members(self, group_id):
 try:
 keys = self.groups[group_id].get_player_ids()
 for k in keys:
 #drop any clients that are idle for more than 8 hours
 #as these are likely dead clients
 idlemins = self.players[k].idle_time()
 idlemins = idlemins/60
-if (idlemins > self.zombie_time): self.admin_kick(k,"Removing zombie client", self.silent_auto_kick)
+if (idlemins > self.zombie_time):
+self.admin_kick(k,"Removing zombie client", self.silent_auto_kick)
 elif self.players[k].get_status() != MPLAY_CONNECTED:
 if self.players[k].check_time_out():
 self.log_msg("Player #" + k + " Lost connection!")
 self.admin_kick(k,"Removing dead client", self.silent_auto_kick)
 except Exception, e:
 self.log_msg("Exception: check_group_members(): " + str(e))
 def remote_admin_handler(self,xml_dom,data):
-"""
 # handle incoming remove server admin messages
 # (allows basic administration of server from a remote client)
 # base message format: <admin id="" pwd="" cmd="" [data for command]>
-"""
-if not self.allowRemoteAdmin: return
+if not self.allowRemoteAdmin:
+return
 try:
 pid = xml_dom.getAttribute("id")
 gid = ""
 given_pwd = xml_dom.getAttribute("pwd")
 cmd = xml_dom.getAttribute("cmd")
 server_admin_pwd = self.groups["0"].boot_pwd
 p_id = ""
 p_name= ""
 p_ip = ""
 #verify that the message came from the proper ID/Socket and get IP address for logging
 if self.players.has_key(pid):
 p_name=(self.players[pid]).name
 p_ip=(self.players[pid]).ip
 #dump and log any attempts to control server remotely with invalid password
 if server_admin_pwd != given_pwd:
 #tell the clients password manager the password failed -- SD 8/03
 pm = "<password signal=\"fail\" type=\"server\" id=\"" + str(self.players[pid].group_id) + "\" data=\"\"/>"
 self.players[pid].outbox.put(pm)
-m = "Invalid Remote Server Control Message (bad password) from "
+m = "Invalid Remote Server Control Message (bad password) from #" + str(pid) + " (" + str(p_name) + ") " + str(p_ip)
-m += "#" + str(pid) + " (" + str(p_name) + ") " + str(p_ip)
 self.log_msg( m )
 return
 #message now deemed 'authentic'
 #determine action to take based on command (cmd)
 if cmd == "list":
 #return player list to this user.
 msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'>" + self.player_list_remote()
 self.players[pid].outbox.put(msg)
 elif cmd == "banip":
 ip = xml_dom.getAttribute("bip")
 name = xml_dom.getAttribute("bname")
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'> Banned: " + str(ip)
 self.admin_banip(ip, name)
 elif cmd == "ban":
 id = xml_dom.getAttribute("bid")
 msg = "<msg to='" + id + "' from='0' group_id='" + gid + "'> Banned!"
 self.players[pid].outbox.put(msg)
 self.admin_ban(id, "")
 elif cmd == "unban":
 ip = xml_dom.getAttribute("ip")
 self.admin_unban(ip)
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'> Unbaned: " + str(ip)
 self.players[pid].outbox.put(msg)
 elif cmd == "banlist":
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'>" + self.admin_banlist()
 self.players[pid].outbox.put(msg)
 elif cmd == "killgroup":
 ugid = xml_dom.getAttribute("gid")
 if ugid == "0":
-m = "<msg to='" + pid + "' from='0' group_id='" + gid + "'>"
+m = "<msg to='" + pid + "' from='0' group_id='" + gid + "'>Cannot Remove Lobby! Remote administrator request denied!"
-m += "Cannot Remove Lobby! Remote administrator request denied!"
 self.players[pid].outbox.put(m)
 else:
 result = self.prune_room(ugid)
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'>" + str(result)
 self.players[pid].outbox.put(msg)
 pmsg = "<msg to='" + tuid + "' from='0' group_id='" + self.players[tuid].group_id + "' >" + msg
 try: self.players[tuid].outbox.put(pmsg)
 except:
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + ">Unknown Player ID: No message sent."
 self.players[pid].outbox.put(msg)
 elif cmd == "broadcast":
 bmsg = xml_dom.getAttribute("msg")
 self.broadcast(bmsg)
 elif cmd == "killserver" and self.allowRemoteKill:
 #dangerous command..once server stopped it must be restarted manually
 self.kill_server()
 elif cmd == "uptime":
 msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'>" + self.uptime(1)
 self.players[pid].outbox.put(msg)
 elif cmd == "help":
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'>"
 msg += self.AdminHelpMessage()
 self.players[pid].outbox.put( msg)
 elif cmd == "roompasswords":
 # Toggle if room passwords are allowed on this server
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'>"
 msg += self.RoomPasswords()
 self.players[pid].outbox.put( msg)
 elif cmd == "createroom":
 rm_name = xml_dom.getAttribute("name")
 rm_pass = xml_dom.getAttribute("pass")
 rm_boot = xml_dom.getAttribute("boot")
 result = self.create_temporary_persistant_room(rm_name, rm_boot, rm_pass)
 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'>" + result
 self.players[pid].outbox.put(msg)
 elif cmd == "nameroom":
 rm_id   = xml_dom.getAttribute("rmid")
 rm_name = xml_dom.getAttribute("name")
 result = self.change_group_name(rm_id,rm_name,pid)
 msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'/>" + result
 self.players[pid].outbox.put(msg)
 elif cmd == "passwd":
 tgid = xml_dom.getAttribute("gid")
 npwd = xml_dom.getAttribute("pass")
 if tgid == "0":
-msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'>"
+msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'>Server password may not be changed remotely!"
-msg += "Server password may not be changed remotely!"
 self.players[pid].outbox.put(msg)
 else:
 try:
 self.groups[tgid].boot_pwd = npwd
 msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'>Password changed for room " + tgid
 self.players[pid].outbox.put(msg)
 except: pass
 elif cmd == "savemaps":
 for g in self.groups.itervalues():
 g.save_map()
 msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'>Persistent room maps saved"
 self.players[pid].outbox.put(msg)
 else:
 msg ="<msg to='" + pid + "' from='0' group_id='" + gid + "'><i>[Unknown Remote Administration Command]</i>"
 self.players[pid].outbox.put(msg)
 except Exception, e:
 self.log_msg("Exception: Remote Admin Handler Error: " + str(e))
 traceback.print_exc()
 def toggleRemoteKill(self):
-if self.allowRemoteKill: self.allowRemoteKill = False
+if self.allowRemoteKill:
-else: self.allowRemoteKill = True
+self.allowRemoteKill = False
+else:
+self.allowRemoteKill = True
 return self.allowRemoteKill
 def toggleRemoteAdmin(self):
-if self.allowRemoteAdmin: self.allowRemoteAdmin = False
+if self.allowRemoteAdmin:
-else: self.allowRemoteAdmin = True
+self.allowRemoteAdmin = False
+else:
+self.allowRemoteAdmin = True
 return self.allowRemoteAdmin
-"""
+#-----------------------------------------------------------------
 # Remote Administrator Help (returns from server not client)
-"""
+#-----------------------------------------------------------------
 def AdminHelpMessage(self):
 "returns a string to be sent as a message to a remote admin"
 #define the help command list information
 info = []
 info.append( ['list', '/admin list', 'Displays information about rooms and players on the server'] )
 info.append( ['uptime', '/admin uptime', 'Information on how long server has been running'] )
 info.append( ['help', '/admin help', 'This help message'])
-info.append( ['passwd', '/admin passwd &lt;group id&gt; &lt;new password&gt;',
+info.append( ['passwd', '/admin passwd &lt;group id&gt; &lt;new password&gt;', 'Changes a rooms bootpassword. Server(lobby) password may not be changed'])
-'Changes a rooms bootpassword. Server(lobby) password may not be changed'])
 info.append( ['roompasswords', '/admin roompasswords', 'Allow/Disallow Room Passwords on the server (toggles)'])
-info.append( ['message', '/admin message &lt;user id&gt; &lt;message&gt;',
+info.append( ['message', '/admin message &lt;user id&gt; &lt;message&gt;', 'Send a message to a specific user on the server'])
-'Send a message to a specific user on the server'])
 info.append( ['broadcast', '/admin broadcast &lt;message&gt;', 'Broadcast message to all players on server'])
-info.append( ['createroom', '/admin createroom &lt;room name&gt; &lt;boot password&gt; [password]',
+info.append( ['createroom', '/admin createroom &lt;room name&gt; &lt;boot password&gt; [password]', 'Creates a temporary persistant room if possible.<i>Rooms created this way are lost on server restarts'])
-'Creates a temporary persistant room if possible.<i>Rooms created this way are lost on server restarts'])
 info.append( ['nameroom', '/admin nameroom &lt;group id&gt; &lt;new name&gt;', 'Rename a room'])
-info.append( ['killgroup', '/admin killgroup &lt;room id&gt;',
+info.append( ['killgroup', '/admin killgroup &lt;room id&gt;', 'Remove a room from the server and kick everyone in it.'])
-'Remove a room from the server and kick everyone in it.'])
 if self.allowRemoteKill:
-info.append( ['killserver', '/admin killserver',
+info.append( ['killserver', '/admin killserver', 'Shuts down the server. <b>WARNING: Server cannot be restarted remotely via OpenRPG</b>'])
-'Shuts down the server. <b>WARNING: Server cannot be restarted remotely via OpenRPG</b>'])
 info.append( ['ban', '/admin ban {playerId}', 'Ban a player from the server.'])
 info.append( ['unban', '/admin unban {bannedIP}', 'UnBan a player from the server.'])
 info.append( ['banlist', '/admin banlist', 'List Banned IPs and the Names associated with them'])
-info.append( ['savemaps', '/admin savemaps',
+info.append( ['savemaps', '/admin savemaps', 'Save all persistent room maps that are not using the default map file.'])
-'Save all persistent room maps that are not using the default map file.'])
 #define the HTML for the help display
 FS = "<font size='-1'>"
 FE = "<font>"
 help = "<hr><B>REMOTE ADMINISTRATOR COMMANDS SUPPORTED</b><br /><br />"
 help += "<table border='1' cellpadding='2'>"
-help += "<tr><td width='15%'><b>Command</b></td><td width='25%'><b>Format</b>"
+help += "<tr><td width='15%'><b>Command</b></td><td width='25%'><b>Format</b></td><td width='60%'><b>Description</b></td></tr>"
-help += "</td><td width='60%'><b>Description</b></td></tr>"
 for n in info:
-help += "<tr><td>" + FS + n[0] + FE + "</td><td><nobr>" + FS + n[1] + FE + "</nobr>"
+help += "<tr><td>" + FS + n[0] + FE + "</td><td><nobr>" + FS + n[1] + FE + "</nobr></td><td>" + FS + n[2] + FE + "</td></tr>"
-help += "</td><td>" + FS + n[2] + FE + "</td></tr>"
 help += "</table>"
 return help
-"""
+#----------------------------------------------------------------
 # Create Persistant Group -- Added by Snowdog 6/03
 #
 # Allows persistant groups to be created on the fly.
 # These persistant groups are not added to the server.ini file
 # however and are lost on server restarts
 #
 # Updated function code to use per-group based persistance and
 # removed references to outdated persistRoomIdThreshold
-"""
+#----------------------------------------------------------------
 def create_temporary_persistant_room(self, roomname, bootpass, password=""):
 # if the room id just above the persistant room limit is available (not in use)
 # then it will be assigned as a persistant room on the server
 "create a temporary persistant room"
 group_id = str(self.next_group_id)
 self.next_group_id += 1
 self.groups[group_id] = game_group( group_id, roomname, password, "", bootpass, persist = 1 )
 self.log_msg( cgmsg )
 self.send_to_all('0',self.groups[group_id].toxml('new'))
 self.send_to_all('0',self.groups[group_id].toxml('update'))
 return str("Persistant room created (group " + group_id + ").")
-"""
+#----------------------------------------------------------------
 # Prune Room  -- Added by Snowdog 6/03
 #
 # similar to remove_room() except rooms are removed regardless
 # of them being persistant or not
 #
 # Added some error checking and updated room removal for per-room
 # based persistance -- Snowdog 4/04
-"""
+#----------------------------------------------------------------
 def prune_room(self,group):
 #don't allow lobby to be removed
 if group == '0': return "Lobby is required to exist and cannot be removed."
 #check that group id exists
-if group not in self.groups: return "Invalid Room Id. Ignoring remove request."
+if group not in self.groups:
+return "Invalid Room Id. Ignoring remove request."
 try:
 keys = self.groups[group].get_player_ids()
-for k in keys: self.move_player(k,'0')
+for k in keys:
+self.move_player(k,'0')
 ins = "Room"
 if self.isPersistentRoom(group) : ins="Persistant room"
 self.send_to_all("0",self.groups[group].toxml('del'))
 del self.groups[group]
 self.log_msg(("delete_group", ('0',group)))
 return ins + " removed."
 except:
 traceback.print_exc()
 return "An Error occured on the server during room removal!"
-"""
-#  Remote Player List  -- Added by snowdog 6/03
+#----------------------------------------------------------------
-#
+#  Remote Player List  -- Added by snowdog 6/03
-#  Similar to console listing except formated for web display
+#
-#  in chat window on remote client
+#  Similar to console listing except formated for web display
-"""
+#  in chat window on remote client
+#----------------------------------------------------------------
 def player_list_remote(self):
 COLOR1 = "\"#004080\""  #header/footer background color
 COLOR2 = "\"#DDDDDD\""  #group line background color
 COLOR3 = "\"#FFFFFF\""  #player line background color
 COLOR4 = "\"#FFFFFF\""  #header/footer text color
 LCOLOR = "\"#404040\""  #Lurker text color
 GCOLOR = "\"#FF0000\""  #GM text color
 SIZE   = "size=\"-1\""  #player info text size
 FG = PCOLOR
 "display a condensed list of players on the server"
 self.p_lock.acquire()
 pl = "<br /><table border=\"0\" cellpadding=\"1\" cellspacing=\"2\">"
-pl += "<tr><td colspan='4' bgcolor=" + COLOR1 + "><font color=" + COLOR4 + ">"
+pl += "<tr><td colspan='4' bgcolor=" + COLOR1 + "><font color=" + COLOR4 + "><b>GROUP &amp; PLAYER LIST</b></font></td></tr>"
-pl += "<b>GROUP &amp; PLAYER LIST</b></font></td></tr>"
+try:
-try:
 keys = self.groups.keys()
 keys.sort(id_compare)
 for k in keys:
-groupstring = "<tr><td bgcolor=" + COLOR2 + " colspan='2'>"
+groupstring = "<tr><td bgcolor=" + COLOR2 + " colspan='2'><b>Group " + str(k)  + ": " +  self.groups[k].name  + "</b>"
-groutstring += "<b>Group " + str(k)  + ": " +  self.groups[k].name  + "</b>"
+groupstring += "</td><td bgcolor=" + COLOR2 + " > <i>Password: \"" + self.groups[k].pwd + "\"</td><td bgcolor=" + COLOR2 + " > Boot: \"" + self.groups[k].boot_pwd + "\"</i></td></tr>"
-groupstring += "</td><td bgcolor=" + COLOR2 + " > <i>Password: \"" + self.groups[k].pwd + "\"</td>"
-groupstring += "<td bgcolor=" + COLOR2 + " > Boot: \"" + self.groups[k].boot_pwd + "\"</i></td></tr>"
 pl += groupstring
 ids = self.groups[k].get_player_ids()
 ids.sort(id_compare)
 for id in ids:
 if self.players.has_key(id):
 else: FG = LCOLOR
 else: FG = PCOLOR
 pl += "<tr><td bgcolor=" + COLOR3 + ">"
 pl += "<font color=" + FG + " " + SIZE + ">&nbsp;&nbsp;(" +  (self.players[id]).id  + ") "
 pl += (self.players[id]).name
-pl += "</font></td><td bgcolor=" + COLOR3 + " >"
+pl += "</font></td><td bgcolor=" + COLOR3 + " ><font color=" + FG + " " + SIZE + ">[IP: " + (self.players[id]).ip + "]</font></td><td  bgcolor=" + COLOR3 + " ><font color=" + FG + " " + SIZE + "> "
-pl += "<font color=" + FG + " " + SIZE + ">[IP: " + (self.players[id]).ip + "]</font>"
-pl += "</td><td  bgcolor=" + COLOR3 + " ><font color=" + FG + " " + SIZE + "> "
 pl += (self.players[id]).idle_status()
 pl += "</font></td><td><font color=" + FG + " " + SIZE + ">"
 pl += (self.players[id]).connected_time_string()
 pl += "</font>"
 else:
 self.groups[k].remove_player(id)
 pl +="<tr><td colspan='4' bgcolor=" + COLOR3 + " >Bad Player Ref (#" + id + ") in group"
 pl+="</td></tr>"
-pl += "<tr><td colspan='4' bgcolor=" + COLOR1 + ">"
+pl += "<tr><td colspan='4' bgcolor=" + COLOR1 + "><font color=" + COLOR4 + "><b><i>Statistics: groups: " + str(len(self.groups)) + "  players: " +  str(len(self.players)) + "</i></b></font></td></tr></table>"
-pl += "<font color=" + COLOR4 + "><b><i>Statistics: groups: " + str(len(self.groups)) + "  "
+except Exception, e:
-pl += "players: " +  str(len(self.players)) + "</i></b></font></td></tr></table>"
+self.log_msg(str(e))
-except Exception, e: self.log_msg(str(e))
 self.p_lock.release()
 return pl

Mercurial > traipse_dev

comparison orpg/networking/mplay_server.py @ 90:d1aff41c031b alpha