Changeset 86
- Timestamp:
- 05/26/04 21:33:21 (5 years ago)
- Files:
-
- trunk/jjigw.dtd (modified) (1 diff)
- trunk/jjigw/config.py (modified) (2 diffs)
- trunk/jjigw/ircsession.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/jjigw.dtd
r73 r86 17 17 name CDATA #IMPLIED 18 18 encoding CDATA "us-ascii" 19 nicks_8bit (yes|no) "no"> 19 nicks_8bit (yes|no) "no" 20 max_nick_length CDATA "9" 21 max_channel_length CDATA "50" 22 > 20 23 <!ELEMENT server (#PCDATA) > 21 24 <!ATTLIST server trunk/jjigw/config.py
r81 r86 72 72 self.nicks_8bit=node.prop("nicks_8bit") 73 73 self.name=node.prop("name") 74 self.max_nick_length=int(node.prop("max_nick_length")) 75 self.max_channel_length=int(node.prop("max_nick_length")) 74 76 def get_servers(self): 75 77 r=self.servers … … 78 80 def get_channel_config(self,channel): 79 81 return self.channels.get(normalize(channel)) 80 def valid_nick(self,s ):82 def valid_nick(self,s,strict=1): 81 83 if self.nicks_8bit: 82 84 m=nick8_re.match(s) 83 85 else: 84 86 m=nick_re.match(s) 85 if m: 87 if not m: 88 return 0 89 if not strict: 86 90 return 1 87 else: 88 return 0 91 if len(s)<=self.max_nick_length: 92 return 1 93 return 0 89 94 90 95 class Config: trunk/jjigw/ircsession.py
r82 r86 106 106 else: 107 107 nick=prefix 108 if not self.network.valid_nick(nick ):108 if not self.network.valid_nick(nick,0): 109 109 return None 110 110 else:
