minor fixes

commands/admin.py

@@ -14,7 +14,7 @@ def do_command(self, connection, event):
     
     # Ignore channel commands from users that do not have at least voice in homechannel or operator status in target channel.
     if event.type == "pubmsg":   # It's a channel message.
-        if not self.channels[self.homechannel].is_owner(event.source.nick) and not self.channels[self.homechannel].s_admin(event.source.nick) and not self.channels[self.homechannel].is_oper(event.source.nick) and not self.channels[event.target].is_owner(event.source.nick) and not self.channels[event.target].is_admin(event.source.nick) and not self.channels[event.target].is_oper(event.source.nick): # Does not have at least voiced status in homechannel or operator status in target channel.
+        if not self.channels[self.homechannel].is_owner(event.source.nick) and not self.channels[self.homechannel].is_admin(event.source.nick) and not self.channels[self.homechannel].is_oper(event.source.nick) and not self.channels[event.target].is_owner(event.source.nick) and not self.channels[event.target].is_admin(event.source.nick) and not self.channels[event.target].is_oper(event.source.nick): # Does not have at least voiced status in homechannel or operator status in target channel.
             return
     
     if command == "cmd" or command == "commands":

events/on_join.py

@@ -27,7 +27,7 @@ def process_event(self, connection, event):
     if not self.db.one("SELECT join_greeting FROM channels WHERE name='" + event.target + "' AND network ='" + self.network + "'"): # Do not greet users joining the channel.
         return
     if joins == 1:
-        message = "Welcome to " + red + event.target + reset + ", " + red + event.source.nick + reset + ". For a list of command type " + blue + self.cmdchar + "!cmd" + reset + "."
+        message = "Welcome to " + red + event.target + reset + ", " + red + event.source.nick + reset + ". For a list of command type " + blue + self.cmdchar + "cmd" + reset + "."
     if joins == 3:
         message = "Welcome back in " + red + event.target + reset + ", " + red + event.source.nick + reset + ". Tip: To turn of greetings, type " + blue + "!stopgreet " + reset + "."
     if joins == 5: