Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-30 06:49:24 +01:00
Code Issues Projects Releases Wiki Activity

Improved error message for bad hostmasks in addhostmask.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-04-11 23:37:58 +00:00
parent e89827f203
commit d28d27254f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/User.py
View File

@ -176,7 +176,11 @@ class User(callbacks.Privmsg):
(name, hostmask, password) = privmsgs.getArgs(args, 2, 1) (name, hostmask, password) = privmsgs.getArgs(args, 2, 1)
self._checkNotChannel(irc, msg, password) self._checkNotChannel(irc, msg, password)
if not ircutils.isUserHostmask(hostmask): if not ircutils.isUserHostmask(hostmask):
irc.error('That\'s not a valid hostmask.') irc.error('That\'s not a valid hostmask. Make sure your hostmask '
'includes a nick, then an exclamation point (!), then '
'a user, then an at symbol (@), then a host. Feel '
'free to use wildcards (* and ?, which work just like '
'they do on the command line) in any of these parts.')
return return
try: try:
id = ircdb.users.getUserId(name) id = ircdb.users.getUserId(name)
@ -237,7 +241,9 @@ class User(callbacks.Privmsg):
Sets the new password for the user specified by <name> to Sets the new password for the user specified by <name> to
<new password>. Obviously this message must be sent to the bot <new password>. Obviously this message must be sent to the bot
privately (not in a channel). If --hashed is given, the password will privately (not in a channel). If --hashed is given, the password will
be hashed on disk (rather than being stored in plaintext. be hashed on disk (rather than being stored in plaintext. If the
requesting user is an owner user, the <old password> needn't be
correct.
""" """
(optlist, rest) = getopt.getopt(args, '', ['hashed']) (optlist, rest) = getopt.getopt(args, '', ['hashed'])
(name, oldpassword, newpassword) = privmsgs.getArgs(rest, 3) (name, oldpassword, newpassword) = privmsgs.getArgs(rest, 3)
@ -252,7 +258,9 @@ class User(callbacks.Privmsg):
except KeyError: except KeyError:
irc.errorNoUser() irc.errorNoUser()
return return
if user.checkPassword(oldpassword): requester = ircdb.users.getUser(msg.prefix)
if user.checkPassword(oldpassword) or \
(requester.checkCapability('owner') and not requester == user):
user.setPassword(newpassword, hashed=hashed) user.setPassword(newpassword, hashed=hashed)
ircdb.users.setUser(id, user) ircdb.users.setUser(id, user)
irc.replySuccess() irc.replySuccess()