Updated.

* Added hook on_whoreply.
* PRIVMSGs and NOTICEs that would cause a >512 bytes resulting message are now divided into multiple messages.
* Renamed botnick to botinfo.

NEWS

@@ -11,23 +11,26 @@
 The future of IRC bots is here! Xelhua gives to you, Auto 3.0, a new version of
 the popular Auto IRC bot.
 
-In this alpha5 release, we have added:
+In this alpha6 release, we have added:
 
-* LinkTitle module for returning the page title of links sent to a channel.
+* Support for Microsoft Windows. See doc/WINDOWS if running on Windows.
-* Added core command MODLIST.
+* Added an UNO module for playing the classic game of UNO.
-* Added SEARCH and MORE to QDB. Amount of results returned at a time with
+* Added an Eval module for evaluating Perl code.
-  qdb_search_resnum in the config.
+* Added a BotStats module for returning statistics about the bot.
+* PRIVMSG's and NOTICE's that would create a resulting message of >512 bytes are
+  now divided into multiple messages.
 
 Bug fixes:
 
-* Fixed a bug when viewing non-existent quotes.
+* Fixed a bug that occurs when our configured nickname is in use.
-* SEVERE: Fixed a bug that caused rehash to fail.
+* Fixed a bug with multi-prefix support.
+* Fixed a bug with SASL timeouts.
 
 Incompatibilities:
 
-None
+* Module API changes. Minimum version is now 3.0.0a6 from 3.0.0a4.
 
-We thank you for choosing Auto. Please remember that he is still in early
+We thank you for choosing Auto. Please remember that he is still in mid-
 development stages. But we hope we've piqued your interest, as Auto's upcoming
 module repository will allow modules to be created by anyone and uploaded
 there for everyone to use.
@@ -35,4 +38,4 @@ there for everyone to use.
 Auto's goal is to create an efficient, stable and highly customizable IRC bot
 in Perl. To offer an alternative to other platforms.
 
-Enjoy Auto 3.0.0 Alpha 5!
+Enjoy Auto 3.0.0 Alpha 6!

auto

@@ -50,4 +50,4 @@ else
     echo "Usage: auto (start|stop|rehash|status|getmodules)"
 fi
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

bin/auto

@@ -21,6 +21,10 @@ our $Bin = $Bin; ## no critic qw(NamingConventions::Capitalization Variables::Pr
 BEGIN {
     unshift @INC, "$Bin/../lib";
 
+    open my $gitfh, '<', "$Bin/../.git/refs/heads/indev";
+    our $VERGITREV = substr readline $gitfh, 0, 7;
+    close $gitfh;
+
     # Set version information.
     use constant { ## no critic qw(ValuesAndExpressions::ProhibitConstantPragma)
         NAME   => 'Auto IRC Bot',
@@ -28,7 +32,6 @@ BEGIN {
         SVER   => 0,
         REV    => 0,
         RSTAGE => 'd',
-        GR     => substr `cat $Bin/../.git/refs/heads/indev`, 0, 7
     };
 }
 use Lib::Auto;
@@ -37,7 +40,7 @@ use API::Log qw(alog dbug);
 #use DB::Flatfile;
 use Parser::Config;
 use Parser::Lang;
-use Parser::IRC;
+use Proto::IRC;
 use Core::IRC;
 use Core::Cmd;
 
@@ -179,8 +182,9 @@ given (lc((conf_get('database:format'))[0][0])) {
 
         if (!-e "$Bin/../etc/".(conf_get('database:filename'))[0][0]) {
             # Create <database:filename> if it's missing.
-            system "touch $Bin/../etc/".(conf_get('database:filename'))[0][0];
+            open my $dbfh, '>', "$Bin/../etc/".(conf_get('database:filename'))[0][0];
-            system "chmod a+x $Bin/../etc/".(conf_get('database:filename'))[0][0];
+            close $dbfh;
+            chmod 0755, "$Bin/../etc/".(conf_get('database:filename'))[0][0];
         }
         # Connect to database.
         $DB = DBI->connect("dbi:SQLite:dbname=$Bin/../etc/".(conf_get('database:filename'))[0][0]) or err(2, 'Failed to connect to database!', 1);
@@ -303,6 +307,14 @@ our $STARTTIME = time;
 say '* Auto successfully started at '.POSIX::strftime('%Y-%m-%d %I:%M:%S %p', localtime).q{.};
 alog 'Auto successfully started.';
 
+# If we're on Windows, disable forking.
+if ($OSNAME =~ /win/i) {
+    if (!$DEBUG) {
+        say '!!! Forking unavailable (OS is Microsoft Windows), continuing in debug mode.';
+        $DEBUG = 1;
+    }
+}
+
 # Fork into the background if not in debug mode.
 if (!$DEBUG) {
     say '*** Becoming a daemon...';
@@ -312,9 +324,6 @@ if (!$DEBUG) {
     $APID = fork;
     if ($APID != 0) {
         alog '* Successfully forked into the background. Process ID: '.$APID;
-        if (!-e "$Bin/auto.pid") {
-    		system "touch $Bin/auto.pid";
-    	}
     	open my $FPID, '>', "$Bin/auto.pid" or exit;
     	print {$FPID} "$APID\n" or exit;
     	close $FPID or exit;
@@ -328,6 +337,12 @@ else {
 
 # Events.
 API::Std::event_add('on_preconnect');
+# CAP.
+my %tcsvrs = conf_get('server');
+foreach my $svr (keys %tcsvrs) {
+    $Proto::IRC::cap{$svr} = 'multi-prefix';
+}
+undef %tcsvrs;
 
 # Load modules.
 if (conf_get('module')) {
@@ -346,89 +361,19 @@ my %cservers = conf_get('server');
 # Set the socket hash and select instance.
 our (%SOCKET, $SELECT);
 $SELECT = IO::Select->new();
-my $it = 0;
 # Iterate through each configured server.
 foreach my $cskey (keys %cservers) {
-    # Prepare socket data.
+    Lib::Auto::ircsock(\%{$cservers{$cskey}}, $cskey);
-    my %conndata = (
-    	Proto => 'tcp',
-        LocalAddr => $cservers{$cskey}{'bind'}[0],
-    	PeerAddr  => $cservers{$cskey}{'host'}[0],
-    	PeerPort  => $cservers{$cskey}{'port'}[0],
-        Timeout   => 20,
-    );
-    # Set IPv6/SSL data.
-    my $use6 = 0;
-    my $usessl = 0;
-    if (defined $cservers{$cskey}{'ipv6'}[0]) { $use6 = $cservers{$cskey}{'ipv6'}[0]; }
-    if (defined $cservers{$cskey}{'ssl'}[0]) { $usessl = $cservers{$cskey}{'ssl'}[0]; }
-
-    # CertFP.
-    if ($usessl) {
-        if (defined $cservers{$cskey}{'certfp'}[0]) {
-            if ($cservers{$cskey}{'certfp'}[0] eq 1) {
-                $conndata{'SSL_use_cert'} = 1;
-                if (defined $cservers{$cskey}{'certfp_cert'}[0]) {
-                    $conndata{'SSL_cert_file'} = "$Bin/../etc/certs/".$cservers{$cskey}{'certfp_cert'}[0];
-                }
-                if (defined $cservers{$cskey}{'certfp_key'}[0]) {
-                    $conndata{'SSL_key_file'} = "$Bin/../etc/certs/".$cservers{$cskey}{'certfp_key'}[0];
-                }
-                if (defined $cservers{$cskey}{'certfp_pass'}[0]) {
-                    $conndata{'SSL_passwd_cb'} = sub { return $cservers{$cskey}{'certfp_pass'}[0]; };
-                }
-            }
-        }
-    }
-
-    # Create the socket.
-    if ($use6) {
-        $SOCKET{$cskey} = IO::Socket::INET6->new(%conndata) or # Or error.
-        err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-        and delete $SOCKET{$cskey} and next;
-    }
-    else {
-        if ($usessl) {
-            $SOCKET{$cskey} = IO::Socket::SSL->new(%conndata) or # Or error.
-            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-            and delete $SOCKET{$cskey} and next;
-        }
-        else {
-            $SOCKET{$cskey} = IO::Socket::INET->new(%conndata) or # Or error.
-            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-            and delete $SOCKET{$cskey} and next;
-        }
-    }
-
-    # Send PASS if we have one.
-    if (defined $cservers{$cskey}{'pass'}[0]) {
-    	socksnd($cskey, 'PASS :'.$cservers{$cskey}{'pass'}[0]) or
-    		err(2, 'Failed to connect to server: '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-    		and next;
-    }
-    API::Std::event_run('on_preconnect', $cskey);
-    # Send NICK/USER.
-    API::IRC::nick($cskey, $cservers{$cskey}{'nick'}[0]);
-    socksnd($cskey, 'USER '.$cservers{$cskey}{'ident'}[0].q{ }.hostname.q{ }.$cservers{$cskey}{'host'}[0].' :'.$cservers{$cskey}{'realname'}[0]) or
-    	err(2, 'Failed to connect to server: '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-    	and next;
-    # Add to select.
-    $SELECT->add($SOCKET{$cskey});
-    # Success!
-    alog '** Successfully connected to server: '.$cskey;
-    dbug '** Successfully connected to server: '.$cskey;
-    $it = 1;
 }
 
 # Success!
-if ($it) {
+if (keys %SOCKET) {
     alog '** Success: Connected to server(s).';
     dbug '** Success: Connected to server(s).';
 }
 else {
-    err(2, 'No server connections.', 1);
+    err(2, 'No IRC connections -- Exiting program.', 1);
 }
-undef $it;
 
 # Create core commands.
 API::Std::cmd_add('MODLOAD', 1, 'cfunc.modules', \%Core::Cmd::HELP_MODLOAD, \&Core::Cmd::cmd_modload);
@@ -499,7 +444,7 @@ while (1) {
     		dbug $sockid.' >> '.$line;
 
             # Parse data.
-    		Parser::IRC::ircparse($sockid, $line);
+    		Proto::IRC::ircparse($sockid, $line);
     	}
     }
 }
@@ -509,12 +454,11 @@ while (1) {
 ###############
 
 # Send data to socket.
-sub socksnd
+sub socksnd {
-{
     my ($svr, $data) = @_;
 
     if (defined $SOCKET{$svr}) {
-    	syswrite $SOCKET{$svr}, $data."\n", POSIX::BUFSIZ, 0;
+    	syswrite $SOCKET{$svr}, $data."\r\n", POSIX::BUFSIZ, 0;
     	dbug "$svr << $data";
     	return 1;
     }
@@ -547,4 +491,4 @@ sub mod_load {
     return;
 }
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

bin/buildmod

@@ -150,4 +150,4 @@ $manifier->parse_from_file("$Bin/../autodoc/$module.pod", "$Bin/../autodoc/$modu
 print $RS;
 say 'Done.';
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

bin/critic

@@ -58,4 +58,4 @@ foreach (@violations) {
 }
 say "$count violations in $ARGV[0].";
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

bin/genssl

@@ -44,4 +44,4 @@ while ($fpr =~ s/(.*\n)//) {
 # Print the fingerprint.
 say 'Done. Fingerprint: '.$fp;
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

doc/CHANGELOG

@@ -2,6 +2,35 @@ Auto IRC Bot 3.0: Change Log
 -------------------------------------------------------------------------------
 
 3.0 Indev
+===============================================================================
+
+
+3.0 Alpha 6
+===============================================================================
+    * Bug fix: Fixed an issue with SASL timeout.
+    * Added hook on_capack.
+    * CAP is now core.
+    * Fixed a bug with multi-prefix support.
+    * Added fpfmt() to API::Std.
+    * Auto::GR renamed to $Auto::VERGITREV.
+    * Bumped minimum version for API to 3.0.0a6.
+    * Changed on_topic args to: full source hashref, new topic array
+    * on_topic is now triggered for any topic change, regardless of source.
+    * Now parsing numeric 004.
+    * Added hook on_isupport.
+    * Added a BotStats module for returning statistics about the bot.
+    * Now parsing numeric 396.
+    * Added who() to API::IRC.
+    * Added hook on_whoreply.
+    * PRIVMSGs and NOTICEs that would cause a >512 bytes resulting message are
+      now divided into multiple messages.
+    * Renamed botnick to botinfo.
+    * Renamed Parser::IRC to Proto::IRC.
+    * Added an Eval module.
+    * Added an UNO module.
+    * Added on_part hook.
+    
+3.0 Alpha 5
 ===============================================================================
     * Bug fix: Fixed broken rehash.
     * Ignore PRIVMSG's if they're from an invalid source.

doc/TODO

@@ -42,7 +42,7 @@ Legend:
  [!] Features
      [X] Weather module
      [!] Urban Dictionary module
-     [ ] UNO module
+     [X] UNO module
      [ ] Google Search module
      [ ] IRC Relay module
      [ ] (Google?) News module
@@ -51,7 +51,7 @@ Legend:
      [X] Google Calculator module
      [ ] YouTube Search module
      [ ] Twitter module
-     [!] Advanced Topics module
+     [X] Advanced Topics module
      [ ] Custom Triggers module
      [X] Shorten URL (bit.ly?) module
      [?] Bot Talk module

doc/WINDOWS

@@ -0,0 +1,18 @@
+Auto IRC Bot 3.0: Microsoft Windows Notes
+===============================================================================
+
+When running Auto on Microsoft Windows, you should be aware of the following:
+
+* Windows support has not been thoroughly tested, some scripts/features may not
+  function correctly.
+* Forking into the background is disabled.
+* Some file system operations may fail if Auto is installed to a path with
+  spaces. Please report these.
+
+For the full power of Auto; run him in a UNIX environment.
+
+Since Windows support can be considered experimental, testers are welcome and
+you should report anything you find to malfunction.
+
+At some point in the future, we hope to achieve Windows support with no core
+caveats. Again, reporting issues in Auto on Windows is highly appreciated.

install

@@ -59,18 +59,21 @@ eval {
 print "Checking operating system..... $OSNAME - ";
 if ($OSNAME =~ /dos/i) {
     print "DOS is not supported.\r\n";
+    exit;
 }
 elsif ($OSNAME eq "MSWin32") {
-    print "Microsoft Windows is not supported. Support is planned for the future.\r\n";
+    print "OK\r\n";
 }
 elsif ($OSNAME eq "NetWare") {
     print "NetWare is not supported.\r\n";
+    exit;
 }
 elsif ($OSNAME eq "linux") {
     print "OK\n";
 }
 elsif ($OSNAME eq "os2") {
     print "IBM OS/2 is not supported.\r\n";
+    exit;
 }
 elsif ($OSNAME =~ /mac/i or $OSNAME =~ /darwin/i) {
     print "OK\r";
@@ -81,8 +84,12 @@ elsif ($OSNAME eq "freebsd") {
 elsif ($OSNAME eq "openbsd") {
     print "OK\n";
 }
+elsif ($OSNAME eq "solaris") {
+    print "OK\n";
+}
 else {
     print "Unknown operating system. Contact support.\r\n";
+    exit;
 }    	
 
 # Check for Perl core modules.
@@ -124,19 +131,7 @@ else {
 println "\0";
 println "Building.....";
 if (!-d "$Bin/build") {
-    system "mkdir $Bin/build";
+    mkdir "$Bin/build";
-}
-if (!-e "$Bin/build/time") {
-    system "touch $Bin/build/time";
-}
-if (!-e "$Bin/build/os") {
-    system "touch $Bin/build/os";
-}
-if (!-e "$Bin/build/perl") {
-    system "touch $Bin/build/perl";
-}
-if (!-e "$Bin/build/ver") {
-    system "touch $Bin/build/ver";
 }
 
 build($features);
@@ -149,4 +144,4 @@ println q{};
 # Success!
 println "Done. Auto successfully installed.";
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/API/IRC.pm

@@ -9,7 +9,7 @@ use Exporter;
 
 our @ISA       = qw(Exporter);
 our @EXPORT_OK = qw(ban cjoin cpart cmode umode kick privmsg notice quit nick names
-                    topic usrc match_mask);
+                    topic who usrc match_mask);
 
 
 # Set a ban, based on config bantype value.
@@ -67,7 +67,7 @@ sub cpart
     	Auto::socksnd($svr, "PART $chan :Leaving");
     }
 
-    if (defined $Parser::IRC::botchans{$svr}{$chan}) { delete $Parser::IRC::botchans{$svr}{$chan}; }
+    if (defined $Proto::IRC::botchans{$svr}{$chan}) { delete $Proto::IRC::botchans{$svr}{$chan}; }
     
     return 1;
 }
@@ -87,7 +87,7 @@ sub umode
 {
     my ($svr, $modes) = @_;
     
-    Auto::socksnd($svr, "MODE ".$Parser::IRC::botnick{$svr}{nick}." $modes");
+    Auto::socksnd($svr, "MODE ".$Proto::IRC::botinfo{$svr}{nick}." $modes");
     
     return 1;
 } 
@@ -97,7 +97,15 @@ sub privmsg
 {
     my ($svr, $target, $message) = @_;
     
-    Auto::socksnd($svr, "PRIVMSG $target :$message");
+    # Get maximum length.
+    my $maxlen = 510 - length q{:}.$Proto::IRC::botinfo{$svr}{nick}.q{!}.$Proto::IRC::botinfo{$svr}{user}.q{@}.$Proto::IRC::botinfo{$svr}{mask}." PRIVMSG $target :";
+
+    # Divide message if it surpasses the maximum length.
+    while (length $message >= $maxlen) {
+        my $submsg = substr $message, 0, $maxlen, q{};
+        Auto::socksnd($svr, "PRIVMSG $target :$submsg");
+    }
+    if (length $message) { Auto::socksnd($svr, "PRIVMSG $target :$message") }
     
     return 1;
 }
@@ -107,7 +115,15 @@ sub notice
 {
     my ($svr, $target, $message) = @_;
     
-    Auto::socksnd($svr, "NOTICE $target :$message");
+    # Get maximum length.
+    my $maxlen = 510 - length q{:}.$Proto::IRC::botinfo{$svr}{nick}.q{!}.$Proto::IRC::botinfo{$svr}{user}.q{@}.$Proto::IRC::botinfo{$svr}{mask}." NOTICE $target :";
+
+    # Divide message if it surpasses the maximum length.
+    while (length $message >= $maxlen) {
+        my $submsg = substr $message, 0, $maxlen, q{};
+        Auto::socksnd($svr, "NOTICE $target :$submsg");
+    }
+    if (length $message) { Auto::socksnd($svr, "NOTICE $target :$message") }
     
     return 1;
 }
@@ -129,8 +145,8 @@ sub nick
     
     Auto::socksnd($svr, "NICK $newnick");
     
-    $Parser::IRC::botnick{$svr}{newnick} = $newnick;
+    $Proto::IRC::botinfo{$svr}{newnick} = $newnick;
-    
+
     return 1;
 }
 
@@ -165,8 +181,7 @@ sub kick
 }
 
 # Quit IRC.
-sub quit 
+sub quit {
-{
     my ($svr, $reason) = @_;
     
     if (defined $reason) {
@@ -176,12 +191,20 @@ sub quit
     	Auto::socksnd($svr, "QUIT :Leaving");
     }
     
-    delete $Parser::IRC::got_001{$svr} if (defined $Parser::IRC::got_001{$svr});
+    delete $Proto::IRC::got_001{$svr} if (defined $Proto::IRC::got_001{$svr});
-    delete $Parser::IRC::botnick{$svr} if (defined $Parser::IRC::botnick{$svr});
+    delete $Proto::IRC::botinfo{$svr} if (defined $Proto::IRC::botinfo{$svr});
     
     return 1;
 }
 
+# Send a WHO.
+sub who {
+    my ($svr, $nick) = @_;
+
+    Auto::socksnd($svr, "WHO $nick");
+
+    return 1;
+}
 
 # Get nick, ident and host from a <nick>!<ident>@<host>
 sub usrc
@@ -219,4 +242,4 @@ sub match_mask
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/API/Log.pm

@@ -10,7 +10,7 @@ use POSIX;
 use Time::Local;
 use Exporter;
 use base qw(Exporter);
-use API::Std qw(conf_get);
+use API::Std qw(conf_get fpfmt);
 
 our @EXPORT_OK = qw(println dbug alog slog);
 
@@ -59,10 +59,6 @@ sub alog
     if (!-d "$Auto::Bin/../var") {
     	mkdir "$Auto::Bin/../var", 0600; ## no critic qw(ValuesAndExpressions::ProhibitMagicNumbers)
     }
-    # Create var/DATE.log if it doesn't exist.
-    if (!-e "$Auto::Bin/../var/$date.log") {
-    	system "touch $Auto::Bin/../var/$date.log";
-    }
 
     # Open the logfile, print the log message to it and close it.
     open my $FLOG, '>>', "$Auto::Bin/../var/$date.log" or return;
@@ -89,7 +85,7 @@ sub expire_logs
     }
 
     # Iterate through each logfile.
-    foreach my $file (glob "$Auto::Bin/../var/*") {
+    foreach my $file (glob fpfmt("$Auto::Bin/../var/*")) {
     	my (undef, $file) = split 'bin/../var/', $file; ## no critic qw(BuiltinFunctions::ProhibitStringySplit)
 
     	# Convert filename to UNIX time.
@@ -129,7 +125,7 @@ sub slog
         }
 
         # Check if we're in the channel.
-        if (!defined $Parser::IRC::botchans{$net}{$chan}) {
+        if (!defined $Proto::IRC::botchans{$net}{$chan}) {
             dbug 'WARNING: slog(): Unable to log to IRC: Not in channel.';
             alog 'WARNING: slog(): Unable to log to IRC: Not in channel.';
             return;
@@ -143,4 +139,4 @@ sub slog
 }
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/API/Std.pm

@@ -12,7 +12,7 @@ use base qw(Exporter);
 our (%LANGE, %MODULE, %EVENTS, %HOOKS, %CMDS);
 our @EXPORT_OK = qw(conf_get trans err awarn timer_add timer_del cmd_add 
     				cmd_del hook_add hook_del rchook_add rchook_del match_user
-    				has_priv mod_exists ratelimit_check);
+    				has_priv mod_exists ratelimit_check fpfmt);
 
 
 # Initialize a module.
@@ -26,7 +26,7 @@ sub mod_init
     if (keys %Auto::SOCKET) { API::Log::slog('MODULES: Attempting to load '.$name.' (version '.$version.') by '.$author.'...'); }
 
     # Check if this module is compatible with this version of Auto.
-    if ($autover ne '3.0.0a4' and $autover ne '3.0.0a5') {
+    if ($autover !~ m/^3\.0\.0a(6)$/xsm) {
     	API::Log::dbug('MODULES: Failed to load '.$name.': Incompatible with your version of Auto.');
     	API::Log::alog('MODULES: Failed to load '.$name.': Incompatible with your version of Auto.');
         if (keys %Auto::SOCKET) { API::Log::slog('MODULES: Failed to load '.$name.': Incompatible with your version of Auto.'); }
@@ -266,9 +266,9 @@ sub rchook_add
     my ($cmd, $sub) = @_;
     $cmd = uc $cmd;
 
-    if (defined $Parser::IRC::RAWC{$cmd}) { return; }
+    if (defined $Proto::IRC::RAWC{$cmd}) { return; }
 
-    $Parser::IRC::RAWC{$cmd} = $sub;
+    $Proto::IRC::RAWC{$cmd} = $sub;
 
     return 1;
 }
@@ -279,9 +279,9 @@ sub rchook_del
     my ($cmd) = @_;
     $cmd = uc $cmd;
 
-    if (!defined $Parser::IRC::RAWC{$cmd}) { return; }
+    if (!defined $Proto::IRC::RAWC{$cmd}) { return; }
 
-    delete $Parser::IRC::RAWC{$cmd};
+    delete $Proto::IRC::RAWC{$cmd};
 
     return 1;
 }
@@ -386,15 +386,15 @@ sub match_user
                 my $svr = $ulhp{net}[0];
                 if (defined $Auto::SOCKET{$svr}) {
                     if ($ccnm eq 'CURRENT' and defined $user{chan}) {
-                        if (defined $Parser::IRC::chanusers{$svr}{$user{chan}}{$user{nick}}) {
+                        if (defined $Proto::IRC::chanusers{$svr}{$user{chan}}{$user{nick}}) {
-                            if ($Parser::IRC::chanusers{$svr}{$user{chan}}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
+                            if ($Proto::IRC::chanusers{$svr}{$user{chan}}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
                         }
                     }
                     else {
-                        foreach my $bcj (keys %{ $Parser::IRC::botchans{$svr} }) {
+                        foreach my $bcj (keys %{ $Proto::IRC::botchans{$svr} }) {
                             if (API::IRC::match_mask($bcj, $ccnm)) {
-                                if (defined $Parser::IRC::chanusers{$svr}{$bcj}{$user{nick}}) {
+                                if (defined $Proto::IRC::chanusers{$svr}{$bcj}{$user{nick}}) {
-                                    if ($Parser::IRC::chanusers{$svr}{$bcj}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
+                                    if ($Proto::IRC::chanusers{$svr}{$bcj}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
                                 }
                             }
                         }
@@ -485,7 +485,10 @@ sub err ## no critic qw(Subroutines::ProhibitBuiltinHomonyms)
     }
 
     # If it's a fatal error, exit the program.
-    if ($fatal) { exit; }
+    if ($fatal) {
+        API::Std::event_run('on_shutdown');
+        exit; 
+    }
 
     return 1;
 }
@@ -516,6 +519,14 @@ sub awarn
     return 1;
 }
 
+# Formatting a file path.
+sub fpfmt {
+    my ($path) = @_;
+
+    if ($path =~ m/\s/xsm) { return "\"$path\""; }
+    else { return $path; }
+}
+
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/Core/Cmd.pm

@@ -186,10 +186,10 @@ sub cmd_restart
 
     # Time to come back from the dead!
     if ($Auto::DEBUG) {
-        system("$Auto::Bin/auto -d -nuc");
+        exec "perl $Auto::Bin/auto -d -nuc";
     }
     else {
-        system("$Auto::Bin/auto -nuc");
+        exec "perl $Auto::Bin/auto -nuc";
     }
     exit;
 
@@ -314,4 +314,4 @@ sub cmd_help
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/Core/IRC.pm

@@ -19,7 +19,7 @@ hook_add("on_uprivmsg", "ctcp_version_reply", sub {
             notice($src->{svr}, $src->{nick}, "\001VERSION ".Auto::NAME." ".Auto::VER.".".Auto::SVER.".".Auto::REV.Auto::RSTAGE." ".$OSNAME."\001");
         }
         else {
-            notice($src->{svr}, $src->{nick}, "\001VERSION ".Auto::NAME." ".Auto::VER.".".Auto::SVER.".".Auto::REV.Auto::RSTAGE."-".Auto::GR." ".$OSNAME."\001");
+            notice($src->{svr}, $src->{nick}, "\001VERSION ".Auto::NAME." ".Auto::VER.".".Auto::SVER.".".Auto::REV.Auto::RSTAGE."-$Auto::VERGITREV ".$OSNAME."\001");
         }
     }
 
@@ -32,8 +32,8 @@ hook_add("on_quit", "quit_update_chanusers", sub {
     my %src = %{ $src };
 
     # Delete the user from all channels.
-    foreach my $ccu (keys %{ $Parser::IRC::chanusers{$svr} }) {
+    foreach my $ccu (keys %{ $Proto::IRC::chanusers{$svr} }) {
-        if (defined $Parser::IRC::chanusers{$svr}{$ccu}{$src{nick}}) { delete $Parser::IRC::chanusers{$svr}{$ccu}{$src{nick}}; }
+        if (defined $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}) { delete $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}; }
     }
 
     return 1;
@@ -51,6 +51,15 @@ hook_add("on_connect", "on_connect_modes", sub {
     return 1;
 });
 
+# Self-WHO on connect.
+hook_add('on_connect', 'on_connect_selfwho', sub {
+    my ($svr) = @_;
+
+    API::IRC::who($svr, $Proto::IRC::botinfo{$svr}{nick});
+
+    return 1;
+});
+
 # Plaintext auth.
 hook_add("on_connect", "plaintext_auth", sub {
     my ($svr) = @_;
@@ -114,6 +123,54 @@ hook_add("on_connect", "autojoin", sub {
     return 1;
 });
 
+# WHO reply.
+hook_add('on_whoreply', 'selfwho.getdata', sub {
+    my (($svr, $nick, undef, $user, $mask, undef, undef, undef, undef, undef)) = @_;
+
+    # Check if it's for us.
+    if ($nick eq $Proto::IRC::botinfo{$svr}{nick}) {
+        # It is. Set data.
+        $Proto::IRC::botinfo{$svr}{user} = $user;
+        $Proto::IRC::botinfo{$svr}{mask} = $mask;
+    }
+
+    return 1;
+});
+
+# ISUPPORT - Set prefixes and channel modes.
+hook_add('on_isupport', 'core.prefixchanmode.getdata', sub {
+    my (($svr, @ex)) = @_;
+
+    # Find PREFIX and CHANMODES.
+    foreach my $ex (@ex) {
+    	if ($ex =~ m/^PREFIX/xsm) {
+    		# Found PREFIX.
+    		my $rpx = substr($ex, 8);
+    		my ($pm, $pp) = split('\)', $rpx);
+    		my @apm = split(//, $pm);
+    		my @app = split(//, $pp);
+    		foreach my $ppm (@apm) {
+    			# Store data.
+    			$Proto::IRC::csprefix{$svr}{$ppm} = shift(@app);
+    		}
+    	}
+        elsif ($ex =~ m/^CHANMODES/xsm) {
+            # Found CHANMODES.
+            my ($mtl, $mtp, $mtpp, $mts) = split m/[,]/xsm, substr($ex, 10);
+            # List modes.
+            foreach (split(//, $mtl)) { $Proto::IRC::chanmodes{$svr}{$_} = 1; }
+            # Modes with parameter.
+            foreach (split(//, $mtp)) { $Proto::IRC::chanmodes{$svr}{$_} = 2; }
+            # Modes with parameter when +.
+            foreach (split(//, $mtpp)) { $Proto::IRC::chanmodes{$svr}{$_} = 3; }
+            # Modes without parameter.
+            foreach (split(//, $mts)) { $Proto::IRC::chanmodes{$svr}{$_} = 4; }
+        }
+    }
+
+    return 1;
+});
+
 sub clear_usercmd_timer 
 {
     # If ratelimit is set to 1 in config, add this timer.
@@ -133,4 +190,4 @@ sub clear_usercmd_timer
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/Lib/Auto.pm

@@ -134,83 +134,106 @@ sub rehash
     # Iterate through each configured server.
     foreach my $cskey (keys %cservers) {
         if (!defined $Auto::SOCKET{$cskey}) {
-            # Prepare socket data.
+            ircsock(\%{$cservers{$cskey}}, $cskey);
-            my %conndata = (
-                Proto => 'tcp',
-                LocalAddr => $cservers{$cskey}{'bind'}[0],
-                PeerAddr  => $cservers{$cskey}{'host'}[0],
-                PeerPort  => $cservers{$cskey}{'port'}[0],
-                Timeout   => 20,
-            );
-            # Set IPv6/SSL data.
-            my $use6 = 0;
-            my $usessl = 0;
-            if (defined $cservers{$cskey}{'ipv6'}[0]) { $use6 = $cservers{$cskey}{'ipv6'}[0]; }
-            if (defined $cservers{$cskey}{'ssl'}[0]) { $usessl = $cservers{$cskey}{'ssl'}[0]; }
-
-            # CertFP.
-            if ($usessl) {
-                if (defined $cservers{$cskey}{'certfp'}[0]) {
-                    if ($cservers{$cskey}{'certfp'}[0] eq 1) {
-                        $conndata{'SSL_use_cert'} = 1;
-                        if (defined $cservers{$cskey}{'certfp_cert'}[0]) {
-                            $conndata{'SSL_cert_file'} = "$Auto::Bin/../etc/certs/".$cservers{$cskey}{'certfp_cert'}[0];
-                        }
-                        if (defined $cservers{$cskey}{'certfp_key'}[0]) {
-                            $conndata{'SSL_key_file'} = "$Auto::Bin/../etc/certs/".$cservers{$cskey}{'certfp_key'}[0];
-                        }
-                        if (defined $cservers{$cskey}{'certfp_pass'}[0]) {
-                            $conndata{'SSL_passwd_cb'} = sub { return $cservers{$cskey}{'certfp_pass'}[0]; };
-                        }
-                    }
-                }
-            }
-
-            # Create the socket.
-            if ($use6) {
-                $Auto::SOCKET{$cskey} = IO::Socket::INET6->new(%conndata) or # Or error.
-                err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-                    and delete $Auto::SOCKET{$cskey} and next;
-            }
-            else {
-                if ($usessl) {
-                    $Auto::SOCKET{$cskey} = IO::Socket::SSL->new(%conndata) or # Or error.
-                    err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-                        and delete $Auto::SOCKET{$cskey} and next;
-                }
-                else {
-                    $Auto::SOCKET{$cskey} = IO::Socket::INET->new(%conndata) or # Or error.
-                    err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-                        and delete $Auto::SOCKET{$cskey} and next;
-                }
-            }
-
-            # Send PASS if we have one.
-            if (defined $cservers{$cskey}{'pass'}[0]) {
-                Auto::socksnd($cskey, 'PASS :'.$cservers{$cskey}{'pass'}[0]) or
-                err(2, 'Failed to connect to server: '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-                    and next;
-            }
-            API::Std::event_run('on_preconnect', $cskey);
-            # Send NICK/USER.
-            API::IRC::nick($cskey, $cservers{$cskey}{'nick'}[0]);
-            Auto::socksnd($cskey, 'USER '.$cservers{$cskey}{'ident'}[0].q{ }.hostname.q{ }.$cservers{$cskey}{'host'}[0].' :'.$cservers{$cskey}{'realname'}[0]) or
-            err(2, 'Failed to connect to server: '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
-                and next;
-            # Add to select.
-            $Auto::SELECT->add($Auto::SOCKET{$cskey});
-            # Success!
-            alog '** Successfully connected to server: '.$cskey;
-            dbug '** Successfully connected to server: '.$cskey;
         }
     }
 
+    # Check for server connections.
+    if (!keys %Auto::SOCKET) {
+        err(2, 'No IRC connections -- Exiting program.', 0);
+        API::Std::event_run('on_shutdown');
+        exit 1;
+    }
+
     # Now trigger on_rehash.
     API::Std::event_run('on_rehash');
 
     return 1;
 }
 
+# Socket creation.
+sub ircsock {
+    my ($cdata, $svrname) = @_;
+
+    # Prepare socket data.
+    my %conndata = (
+    	Proto => 'tcp',
+        LocalAddr => $cdata->{'bind'}[0],
+    	PeerAddr  => $cdata->{'host'}[0],
+    	PeerPort  => $cdata->{'port'}[0],
+        Timeout   => 20,
+    );
+    # Set IPv6/SSL data.
+    my $use6 = 0;
+    my $usessl = 0;
+    if (defined $cdata->{'ipv6'}[0]) { $use6 = $cdata->{'ipv6'}[0]; }
+    if (defined $cdata->{'ssl'}[0]) { $usessl = $cdata->{'ssl'}[0]; }
+
+    # Check for appropriate build data.
+    if ($usessl) {
+        if ($Auto::ENFEAT !~ m/ssl/ixsm) { err(2, '** Auto not built with SSL support: Aborting connection to '.$svrname, 0); return; }
+    }
+    if ($use6) {
+        if ($Auto::ENFEAT !~ m/ipv6/ixsm) { err(2, '** Auto not built with IPv6 support: Aborting connection to '.$svrname, 0); return; }
+    }
+
+    # CertFP.
+    if ($usessl) {
+        if (defined $cdata->{'certfp'}[0]) {
+            if ($cdata->{'certfp'}[0] eq 1) {
+                $conndata{'SSL_use_cert'} = 1;
+                if (defined $cdata->{'certfp_cert'}[0]) {
+                    $conndata{'SSL_cert_file'} = "$Auto::Bin/../etc/certs/".$cdata->{'certfp_cert'}[0];
+                }
+                if (defined $cdata->{'certfp_key'}[0]) {
+                    $conndata{'SSL_key_file'} = "$Auto::Bin/../etc/certs/".$cdata->{'certfp_key'}[0];
+                }
+                if (defined $cdata->{'certfp_pass'}[0]) {
+                    $conndata{'SSL_passwd_cb'} = sub { return $cdata->{'certfp_pass'}[0]; };
+                }
+            }
+        }
+    }
+
+    # Create the socket.
+    if ($use6) {
+        $Auto::SOCKET{$svrname} = IO::Socket::INET6->new(%conndata) or # Or error.
+        err(2, 'Failed to connect to server ('.$ERRNO.'): '.$svrname.' ['.$cdata->{'host'}[0].q{:}.$cdata->{'port'}[0].']', 0)
+            and delete $Auto::SOCKET{$svrname} and return;
+    }
+    else {
+        if ($usessl) {
+            $Auto::SOCKET{$svrname} = IO::Socket::SSL->new(%conndata) or # Or error.
+            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$svrname.' ['.$cdata->{'host'}[0].q{:}.$cdata->{'port'}[0].']', 0)
+            and delete $Auto::SOCKET{$svrname} and next;
+        }
+        else {
+            $Auto::SOCKET{$svrname} = IO::Socket::INET->new(%conndata) or # Or error.
+            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$svrname.' ['.$cdata->{'host'}[0].q{:}.$cdata->{'port'}[0].']', 0)
+            and delete $Auto::SOCKET{$svrname} and next;
+        }
+    }
+
+    # Send PASS if we have one.
+    if (defined $cdata->{'pass'}[0]) {
+        Auto::socksnd($svrname, 'PASS :'.$cdata->{'pass'}[0]) or return;
+    }
+    # Send CAP LS.
+    Auto::socksnd($svrname, 'CAP LS');
+    # Trigger on_preconnect.
+    API::Std::event_run('on_preconnect', $svrname);
+    # Send NICK/USER.
+    API::IRC::nick($svrname, $cdata->{'nick'}[0]);
+    Auto::socksnd($svrname, 'USER '.$cdata->{'ident'}[0].q{ }.hostname.q{ }.$cdata->{'host'}[0].' :'.$cdata->{'realname'}[0]) or return;
+    # Add to select.
+    $Auto::SELECT->add($Auto::SOCKET{$svrname});
+    # Success!
+    alog '** Successfully connected to server: '.$svrname;
+    dbug '** Successfully connected to server: '.$svrname;
+
+    return 1;
+}
+
 # Shutdown.
 hook_add('on_shutdown', 'shutdown.core_cleanup', sub {
     if (defined $Auto::DB) { $Auto::DB->disconnect; }
@@ -283,4 +306,4 @@ sub signal_perldie
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/Lib/Install.pm

@@ -119,16 +119,16 @@ sub installmods
     chomp $response;
     if (lc $response eq 'y') {
         println 'What modules would you like to install? (separate by commas)';
-        println 'Available modules: Badwords, Bitly, Calc, EightBall, FML, Greet, HelloChan, IsItUp, QDB, SASLAuth, Weather';
+        println 'Available modules: Badwords, Bitly, BotStats, Calc, ChanTopics, Dictionary, EightBall, Eval, FML, Greet, HelloChan, IsItUp, LinkTitle, QDB, SASLAuth, Weather';
         print '> ';
         my $modules = <STDIN>; chomp $modules;
         $modules =~ s/ //g;
         my @modst = split ',', $modules;
         foreach (@modst) {
-            system "$Bin/bin/buildmod $_";
+            system "perl \"$Bin/bin/buildmod\" $_";
         }
     }
 }
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/Parser/Config.pm

@@ -177,4 +177,4 @@ sub parse
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/Parser/Lang.pm

@@ -64,4 +64,4 @@ sub parse
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

lib/Proto/IRC.pm

@@ -1,17 +1,21 @@
-# lib/Parser/IRC.pm - Subroutines for parsing incoming data from IRC.
+# lib/Proto/IRC.pm - Subroutines for parsing incoming data from IRC.
 # Copyright (C) 2010-2011 Xelhua Development Group, et al.
 # This program is free software; rights to this code are stated in doc/LICENSE.
-package Parser::IRC;
+package Proto::IRC;
 use strict;
 use warnings;
+use feature qw(switch);
 use API::Std qw(conf_get err awarn trans);
 use API::IRC;
 
 # Raw parsing hash.
 our %RAWC = (
     '001'      => \&num001,
+    '004'      => \&num004,
     '005'      => \&num005,
+    '352'      => \&num352,
     '353'      => \&num353,
+    '396'      => \&num396,
     '432'      => \&num432,
     '433'      => \&num433,
     '438'      => \&num438,
@@ -21,6 +25,7 @@ our %RAWC = (
     '474'      => \&num474,
     '475'      => \&num475,
     '477'      => \&num477,
+    'CAP'      => \&cap,
     'JOIN'     => \&cjoin,
     'KICK'     => \&kick,
     'MODE'     => \&mode,
@@ -33,19 +38,23 @@ our %RAWC = (
 );
 
 # Variables for various functions.
-our (%got_001, %botnick, %botchans, %csprefix, %chanusers, %chanmodes);
+our (%got_001, %botinfo, %botchans, %csprefix, %chanusers, %chanmodes, %cap);
 
 # Events.
-API::Std::event_add("on_connect");
+API::Std::event_add('on_capack');
-API::Std::event_add("on_rcjoin");
+API::Std::event_add('on_connect');
-API::Std::event_add("on_ucjoin");
+API::Std::event_add('on_rcjoin');
-API::Std::event_add("on_kick");
+API::Std::event_add('on_ucjoin');
-API::Std::event_add("on_nick");
+API::Std::event_add('on_isupport');
-API::Std::event_add("on_notice");
+API::Std::event_add('on_kick');
-API::Std::event_add("on_cprivmsg");
+API::Std::event_add('on_nick');
-API::Std::event_add("on_uprivmsg");
+API::Std::event_add('on_notice');
-API::Std::event_add("on_quit");
+API::Std::event_add('on_part');
-API::Std::event_add("on_topic");
+API::Std::event_add('on_cprivmsg');
+API::Std::event_add('on_uprivmsg');
+API::Std::event_add('on_quit');
+API::Std::event_add('on_topic');
+API::Std::event_add('on_whoreply');
 
 # Parse raw data.
 sub ircparse
@@ -85,64 +94,64 @@ sub ircparse
 
 # Parse: Numeric:001
 # Successful connection.
-sub num001
+sub num001 {
-{
     my ($svr, @ex) = @_;
     
     $got_001{$svr} = 1;
-    
+
     # In case we don't get NICK from the server.
-    if (defined $botnick{$svr}{newnick}) {
+    if (!defined $botinfo{$svr}{nick}) {
-    	$botnick{$svr}{nick} = $botnick{$svr}{newnick};
+    	$botinfo{$svr}{nick} = $botinfo{$svr}{newnick};
-    	delete $botnick{$svr}{newnick};
+    	delete $botinfo{$svr}{newnick};
     }
 
+    # Log.
+    API::Log::alog "! Successfully connected to $svr as $botinfo{$svr}{nick}";
+    API::Log::dbug "! Successfully connected to $svr as $botinfo{$svr}{nick}";
+
     # Trigger on_connect.
-    API::Std::event_run("on_connect", $svr);
+    API::Std::event_run('on_connect', $svr);
     	
     return 1;
 }
 
-# Parse: Numeric:005
+# Parse: Numeric:004
-# Prefixes and channel modes.
+# Server information.
-sub num005
+sub num004 {
-{
     my ($svr, @ex) = @_;
-    
+
-    # Find PREFIX and CHANMODES.
+    # Log server name and version.
-    foreach my $ex (@ex) {
+    API::Log::alog "! $svr: $ex[3] running version $ex[4]";
-    	if ($ex =~ m/^PREFIX/xsm) {
+    API::Log::dbug "! $svr: $ex[3] running version $ex[4]";
-    		# Found PREFIX.
+
-    		my $rpx = substr($ex, 8);
+    return 1;
-    		my ($pm, $pp) = split('\)', $rpx);
+}
-    		my @apm = split(//, $pm);
+
-    		my @app = split(//, $pp);
+# Parse: Numeric:005
-    		foreach my $ppm (@apm) {
+# Server ISUPPORT.
-    			# Store data.
+sub num005 {
-    			$csprefix{$svr}{$ppm} = shift(@app);
+    my ($svr, @ex) = @_;
-    		}
+
-    	}
+    # Trigger on_isupport.
-        elsif ($ex =~ m/^CHANMODES/xsm) {
+    API::Std::event_run('on_isupport', ($svr, @ex[3..$#ex]));
-            # Found CHANMODES.
+
-            my ($mtl, $mtp, $mtpp, $mts) = split m/[,]/xsm, substr($ex, 10);
+    return 1;
-            # List modes.
+}
-            foreach (split(//, $mtl)) { $chanmodes{$svr}{$_} = 1; }
+
-            # Modes with parameter.
+# Parse: Numeric:352
-            foreach (split(//, $mtp)) { $chanmodes{$svr}{$_} = 2; }
+# WHO reply.
-            # Modes with parameter when +.
+sub num352 {
-            foreach (split(//, $mtpp)) { $chanmodes{$svr}{$_} = 3; }
+    my ($svr, @ex) = @_;
-            # Modes without parameter.
+
-            foreach (split(//, $mts)) { $chanmodes{$svr}{$_} = 4; }
+    # Trigger on_whoreply.
-        }
+    API::Std::event_run('on_whoreply', ($svr, $ex[2], $ex[3], $ex[4], $ex[5], $ex[6], @ex[7..$#ex]));
-    }
+
-    			
     return 1;
 }
 
 # Parse: Numeric:353
 # NAMES reply.
-sub num353
+sub num353 {
-{
     my ($svr, @ex) = @_;
     
     # Get rid of the colon.
@@ -152,21 +161,27 @@ sub num353
     # Iterate through each user.
     for (my $i = 5; $i < scalar(@ex); $i++) {
     	my $fi = 0;
-    	foreach (keys %{ $csprefix{$svr} }) {
+        PFITER: foreach (keys %{ $csprefix{$svr} }) {
     		# Check if the user has status in the channel.
     		if (substr($ex[$i], 0, 1) eq $csprefix{$svr}{$_}) {
     			# He/she does. Lets set that.
-    			if (defined $chanusers{$svr}{$ex[4]}{lc(substr($ex[$i], 1))}) {
+    			if (defined $chanusers{$svr}{$ex[4]}{lc $ex[$i]}) {
     				# If the user has multiple statuses.
-    				$chanusers{$svr}{$ex[4]}{lc(substr($ex[$i], 1))} .= $_;
+    				$chanusers{$svr}{$ex[4]}{lc(substr($ex[$i], 1))} = $chanusers{$svr}{$ex[4]}{lc $ex[$i]}.$_;
+                    delete $chanusers{$svr}{$ex[4]}{lc $ex[$i]};
     			}
     			else {
     				# Or not.
     				$chanusers{$svr}{$ex[4]}{lc(substr($ex[$i], 1))} = $_;
     			}
     			$fi = 1;
+                $ex[$i] = substr $ex[$i], 1;
     		}
     	}
+        # Check if there's still a prefix.
+        foreach (keys %{$csprefix{$svr}}) {
+            if (substr($ex[$i], 0, 1) eq $csprefix{$svr}{$_}) { goto 'PFITER' }
+        }
     	# They had status, so go to the next user.
     	next if $fi;
     	# They didn't, set them as a normal user.
@@ -178,10 +193,20 @@ sub num353
     return 1;
 }
 
+# Parse: Numeric:396
+# Hidden host changed.
+sub num396 {
+    my ($svr, @ex) = @_;
+
+    # Update our mask.
+    $botinfo{$svr}{mask} = $ex[3];
+
+    return 1;
+}
+
 # Parse: Numeric:432
 # Erroneous nickname.
-sub num432
+sub num432 {
-{
     my ($svr, undef) = @_;
     
     if ($got_001{$svr}) {
@@ -192,20 +217,18 @@ sub num432
     	API::IRC::quit($svr, "An error occurred.");
     }
     
-    delete $botnick{$svr}{newnick} if (defined $botnick{$svr}{newnick});
+    delete $botinfo{$svr}{newnick} if (defined $botinfo{$svr}{newnick});
     
     return 1;
 }
 
 # Parse: Numeric:433
 # Nickname is already in use.
-sub num433
+sub num433 {
-{
     my ($svr, undef) = @_;
     
-    if (defined $botnick{$svr}{newnick}) {
+    if (defined $botinfo{$svr}{newnick}) {
-    	API::IRC::nick($svr, $botnick{$svr}{newnick}."_");
+    	API::IRC::nick($svr, $botinfo{$svr}{newnick}."_");
-    	delete $botnick{$svr}{newnick} if (defined $botnick{$svr}{newnick});
     }
     
     return 1;
@@ -213,14 +236,13 @@ sub num433
 
 # Parse: Numeric:438
 # Nick change too fast.
-sub num438
+sub num438 {
-{
     my ($svr, @ex) = @_;
     
-    if (defined $botnick{$svr}{newnick}) {
+    if (defined $botinfo{$svr}{newnick}) {
-    	API::Std::timer_add("num438_".$botnick{$svr}{newnick}, 1, $ex[11], sub { 
+    	API::Std::timer_add("num438_".$botinfo{$svr}{newnick}, 1, $ex[11], sub { 
-    		API::IRC::nick($Parser::IRC::botnick{$svr}{newnick});
+    		API::IRC::nick($Proto::IRC::botinfo{$svr}{newnick});
-    		delete $botnick{$svr}{newnick} if (defined $botnick{$svr}{newnick});
+    		delete $botinfo{$svr}{newnick} if (defined $botinfo{$svr}{newnick});
     	 });
     }
     
@@ -229,8 +251,7 @@ sub num438
 
 # Parse: Numeric:465
 # You're banned creep!
-sub num465
+sub num465 {
-{
     my ($svr, undef) = @_;
     
     err(3, "Banned from ".$svr."! Closing link...", 0);
@@ -240,8 +261,7 @@ sub num465
 
 # Parse: Numeric:471
 # Cannot join channel: Channel is full.
-sub num471
+sub num471 {
-{
     my ($svr, (undef, undef, undef, $chan)) = @_;
     
     err(3, "Cannot join channel ".$chan." on ".$svr.": Channel is full.", 0);
@@ -251,8 +271,7 @@ sub num471
 
 # Parse: Numeric:473
 # Cannot join channel: Channel is invite-only.
-sub num473
+sub num473 {
-{
     my ($svr, (undef, undef, undef, $chan)) = @_;
     
     err(3, "Cannot join channel ".$chan." on ".$svr.": Channel is invite-only.", 0);
@@ -262,8 +281,7 @@ sub num473
 
 # Parse: Numeric:474
 # Cannot join channel: Banned from channel.
-sub num474
+sub num474 {
-{
     my ($svr, (undef, undef, undef, $chan)) = @_;
     
     err(3, "Cannot join channel ".$chan." on ".$svr.": Banned from channel.", 0);
@@ -273,8 +291,7 @@ sub num474
 
 # Parse: Numeric:475
 # Cannot join channel: Bad key.
-sub num475
+sub num475 {
-{
     my ($svr, (undef, undef, undef, $chan)) = @_;
     
     err(3, "Cannot join channel ".$chan." on ".$svr.": Bad key.", 0);
@@ -284,8 +301,7 @@ sub num475
 
 # Parse: Numeric:477
 # Cannot join channel: Need registered nickname.
-sub num477
+sub num477 {
-{
     my ($svr, (undef, undef, undef, $chan)) = @_;
     
     err(3, "Cannot join channel ".$chan." on ".$svr.": Need registered nickname.", 0);
@@ -293,16 +309,66 @@ sub num477
     return 1;
 }
 
+# Parse: CAP
+sub cap {
+    my ($svr, @ex) = @_;
+    my $capout;
+
+    # Iterate ex[3].
+    given ($ex[3]) {
+        when ('LS') {
+            # Get our CAP REQ list.
+            my @capreq = ();
+            if ($cap{$svr} =~ m/\s/xsm) { @capreq = split ' ', $cap{$svr} }
+            else { push @capreq, $cap{$svr} }
+
+            # Iterate through what we received from the server.
+            $ex[4] =~ s/^://xsm;
+            foreach my $scap (@ex[4..$#ex]) {
+                # Check if we support this.
+                foreach my $icap (@capreq) {
+                    if ($icap eq $scap) {
+                        $capout .= " $scap";
+                    }
+                }
+            }
+            
+            # Send CAP REQ/CAP END based on what both we and the server support.
+            if (!$capout) { Auto::socksnd($svr, 'CAP END'); }
+            else {
+                $capout = substr $capout, 1;
+                Auto::socksnd($svr, "CAP REQ :$capout");
+            }
+        }
+        when ('ACK') {
+            # Iterate through the ACK arguments.
+            $ex[4] =~ s/^://xsm;
+            my $sasl = 0;
+            foreach (@ex[4..$#ex]) {
+                if ($_ eq 'sasl') { $sasl++ }
+                API::Std::event_run('on_capack', ($svr, $_));
+            }
+            Auto::socksnd($svr, 'CAP END') unless $sasl;
+        }
+        when ('NAK') {
+            # This should never happen, but just in case...
+            API::Log::awarn(2, "$svr: CAP failed: Server refused '$capout'");
+            Auto::socksnd($svr, 'CAP END');
+        }
+    }
+
+    return 1;
+}
+
 # Parse: JOIN
-sub cjoin
+sub cjoin {
-{
     my ($svr, @ex) = @_;
     my %src = API::IRC::usrc(substr($ex[0], 1));
     my $chan = $ex[2];
     $chan =~ s/^://gxsm;
     
     # Check if this is coming from ourselves.
-    if ($src{nick} eq $botnick{$svr}{nick}) {
+    if ($src{nick} eq $botinfo{$svr}{nick}) {
     	$botchans{$svr}{lc $chan} = 1;
     	API::Std::event_run("on_ucjoin", ($svr, $chan));
     }
@@ -317,8 +383,7 @@ sub cjoin
 }
 
 # Parse: KICK
-sub kick
+sub kick {
-{
     my ($svr, @ex) = @_;
     my %src = API::IRC::usrc(substr($ex[0], 1));
 
@@ -337,7 +402,7 @@ sub kick
     }
 
     # Check if we were the ones kicked.
-    if (lc($ex[3]) eq lc($botnick{$svr}{nick})) {
+    if (lc($ex[3]) eq lc($botinfo{$svr}{nick})) {
         # We were kicked!
 
         # Delete channel from botchans.
@@ -363,14 +428,14 @@ sub kick
 }
 
 # Parse: MODE
-sub mode
+sub mode {
-{
     my ($svr, @ex) = @_;
 
-    if ($ex[2] ne $botnick{$svr}{nick}) {
+    if ($ex[2] ne $botinfo{$svr}{nick}) {
         # Set data we'll need later.
         my $chan = $ex[2];
         my $modes = $ex[3];
+        $modes =~ s/^://xsm;
         # Get rid of the useless data, so the mode parser will work smoothly.
         shift @ex; shift @ex; shift @ex; shift @ex;
 
@@ -452,18 +517,17 @@ sub mode
 }
 
 # Parse: NICK
-sub nick
+sub nick {
-{
     my ($svr, ($uex, undef, $nex)) = @_;
-    $nex = substr($nex, 1);
+    $nex =~ s/^://gxsm;
 
     my %src = API::IRC::usrc(substr($uex, 1));
     
     # Check if this is coming from ourselves.
-    if ($src{nick} eq $botnick{$svr}{nick}) {
+    if ($src{nick} eq $botinfo{$svr}{nick}) {
     	# It is. Update bot nick hash.
-    	$botnick{$svr}{nick} = $nex;
+    	$botinfo{$svr}{nick} = $nex;
-    	delete $botnick{$svr}{newnick} if (defined $botnick{$svr}{newnick});
+    	delete $botinfo{$svr}{newnick} if (defined $botinfo{$svr}{newnick});
     }
     else {
     	# It isn't. Update chanusers and trigger on_nick.
@@ -480,8 +544,7 @@ sub nick
 }
 
 # Parse: NOTICE
-sub notice
+sub notice {
-{
     my ($svr, @ex) = @_;
 
     # Ensure this is coming from a user rather than a server.
@@ -501,8 +564,7 @@ sub notice
 }
 
 # Parse: PART
-sub part
+sub part {
-{
     my ($svr, @ex) = @_;
     my %src = API::IRC::usrc(substr($ex[0], 1));
 
@@ -527,8 +589,7 @@ sub part
 }
 
 # Parse: PRIVMSG
-sub privmsg
+sub privmsg {
-{
     my ($svr, @ex) = @_;
     my %data = API::IRC::usrc(substr($ex[0], 1));
 
@@ -543,7 +604,7 @@ sub privmsg
     
     my ($cmd, $cprefix, $rprefix);
     # Check if it's to a channel or to us.
-    if (lc($ex[2]) eq lc($botnick{$svr}{nick})) {
+    if (lc($ex[2]) eq lc($botinfo{$svr}{nick})) {
     	# It is coming to us in a private message.
         
         # Ensure it's a valid length.
@@ -655,8 +716,7 @@ sub privmsg
 }
 
 # Parse: QUIT
-sub quit
+sub quit {
-{
     my ($svr, @ex) = @_;
     my %src = API::IRC::usrc(substr($ex[0], 1));
 
@@ -678,27 +738,19 @@ sub quit
 }
 
 # Parse: TOPIC
-sub topic
+sub topic {
-{
     my ($svr, @ex) = @_;
     my %src = API::IRC::usrc(substr($ex[0], 1));
+    $src{svr} = $svr;
+    $src{chan} = $ex[2];
+    $ex[3] = substr $ex[3], 1;
     
-    # Ignore it if it's coming from us.
+    # Trigger on_topic.
-    if (lc($src{nick}) ne lc($botnick{$svr}{nick})) {
+    API::Std::event_run('on_topic', (\%src, @ex[3..$#ex]));
-    	$src{chan} = $ex[2];
-    	my (@argv);
-    	$argv[0] = substr($ex[3], 1);
-    	if (defined $ex[4]) {
-    		for (my $i = 4; $i < scalar(@ex); $i++) {
-    			push(@argv, $ex[$i]);
-    		}
-    	}
-    	API::Std::event_run("on_topic", ($svr, \%src, @argv));
-    }
     
     return 1;
 }
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:

modules/Badwords.pm

@@ -70,8 +70,8 @@ sub actonbadword
 }
 
 
-API::Std::mod_init('Badwords', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('Badwords', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
@@ -122,6 +122,6 @@ Changing the obvious to your wish.
 
 =over
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 =back

modules/Bitly.pm

@@ -118,8 +118,8 @@ sub reverse
 
 
 # Start initialization.
-API::Std::mod_init('Bitly', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('Bitly', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,URI::Escape perl=5.010000
 
 __END__
@@ -179,6 +179,6 @@ Add Bitly to module auto-load and the following to your configuration file:
 This module adds extra dependencies: LWP::UserAgent and URI::Escape. You can
 get it from the CPAN <http://www.cpan.org>.
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 =back

modules/BotStats.pm

@@ -0,0 +1,115 @@
+# Module: BotStats. See below for documentation.
+# Copyright (C) 2010-2011 Xelhua Development Group, et al.
+# This program is free software; rights to this code are stated in doc/LICENSE.
+package M::BotStats;
+use strict;
+use warnings;
+use English qw(-no_match_vars);
+use API::Std qw(cmd_add cmd_del);
+use API::IRC qw(privmsg);
+
+# Initialization subroutine.
+sub _init {
+    # Create the STATS command.
+    cmd_add('STATS', 2, 0, \%M::BotStats::HELP_STATS, \&M::BotStats::stats) or return;
+
+    # Success.
+    return 1;
+}
+
+# Void subroutine.
+sub _void {
+    # Delete the STATS command.
+    cmd_del('STATS') or return;
+
+    # Success.
+    return 1;
+}
+
+# Help hash for STATS. Spanish, German and French translations needed.
+our %HELP_STATS = (
+    'en' => "This command will return information about the bot (uptime, version, etc.). \2Syntax:\2 STATS",
+);
+
+# Callback for STATS command.
+sub stats {
+    my ($src, undef) = @_;
+
+    # Check if this was private or public.
+    my $target;
+    if ($src->{chan}) {
+        $target = $src->{chan};
+    }
+    else {
+        $target = $src->{nick};
+    }
+
+    # Get uptime data.
+    my $uptime = time - $Auto::STARTTIME;
+    my $days = my $hours = my $mins = my $secs = 0;
+    while ($uptime >= 86_400) { $days++; $uptime -= 86_400; }
+    while ($uptime >= 3_600) { $hours++; $uptime -= 3_600; }
+    while ($uptime >= 60) { $mins++; $uptime -= 60; }
+    while ($uptime >= 1) { $secs++; $uptime--; }
+
+    # Return it.
+    privmsg($src->{svr}, $target, "I have been running for \2$days\2 days, \2$hours\2 hours, \2$mins\2 minutes, and \2$secs\2 seconds.");
+
+    # Return version data.
+    privmsg($src->{svr}, $target, 'I am running '.Auto::NAME.' (version '.Auto::VER.q{.}.Auto::SVER.q{.}.Auto::REV.Auto::RSTAGE.") for Perl $PERL_VERSION on $OSNAME.");
+
+    # Get network and channel data.
+    my $nets = keys %Auto::SOCKET;
+    my $chans;
+    foreach my $net (keys %Auto::SOCKET) {
+        foreach (keys %{$Proto::IRC::botchans{$net}}) { $chans++; }
+    }
+
+    # Return network/channel data.
+    privmsg($src->{svr}, $target, "I am on \2$chans\2 channels across \2$nets\2 networks.");
+
+    return 1;
+}
+
+
+API::Std::mod_init('BotStats', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
+# vim: set ai et sw=4 ts=4:
+# build: perl=5.010000
+
+__END__
+
+=head1 NAME
+
+BotStats - General information about the bot
+
+=head1 VERSION
+
+ 1.00
+
+=head1 SYNOPSIS
+
+ <starcoder> !stats
+ <blue> I have been running for 0 days, 0 hours, 1 minutes, and 5 seconds.
+ <blue> I am running Auto IRC Bot (version 3.0.0a6) for Perl v5.12.3 on linux.
+ <blue> I am on 2 channels, across 1 networks.
+
+=head1 DESCRIPTION
+
+This module creates the STATS command, for returning general information about
+the bot such as uptime, version, etc.
+
+This module is compatible with Auto v3.0.0a6+.
+
+=head1 AUTHOR
+
+This module was written by Elijah Perrault.
+
+This module is maintained by Xelhua Development Group.
+
+=head1 LICENSE AND COPYRIGHT
+
+This module is Copyright 2010-2011 Xelhua Development Group.
+
+This module is released under the same licensing terms as Auto itself.
+
+=cut

modules/Calc.pm

@@ -78,8 +78,8 @@ sub calc
 }
 
 # Start initialization.
-API::Std::mod_init('Calc', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('Calc', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,URI::Escape,JSON,JSON::PP perl=5.010000
 
 __END__
@@ -119,6 +119,6 @@ Google Calculator.
 This module requires LWP::UserAgent, URI::Escape and JSON/JSON::PP. 
 All are obtainable from the CPAN <http://www.cpan.org>.
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 =back

modules/ChanTopics.pm

@@ -282,8 +282,8 @@ sub _getdata
 }
 
 
-API::Std::mod_init('ChanTopics', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('ChanTopics', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
@@ -338,7 +338,7 @@ This module adds no extra dependencies.
 
 This module is not compatible with PostgreSQL, yet.
 
-This module is compatible with Auto v3.0.0a4+.
+This module is compatible with Auto v3.0.0a6+.
 
 Ported from v1.0.
 

modules/Dictionary.pm

@@ -75,8 +75,8 @@ sub cmd_dict
 
 
 # Start initialization.
-API::Std::mod_init('Dictionary', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('Dictionary', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=Net::Dict perl=5.010000
 
 __END__
@@ -99,6 +99,6 @@ DICT command.
 This module adds an extra dependency: Net::Dict. You can get it from the CPAN
 <http://www.cpan.org>.
 
-This module is compatible with Auto v3.0.0a4+.
+This module is compatible with Auto v3.0.0a6+.
 
 =back

modules/EightBall.pm

@@ -99,8 +99,8 @@ sub rigball
 
 
 # Start initialization.
-API::Std::mod_init('EightBall', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('EightBall', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
@@ -143,7 +143,7 @@ command for setting ("rigging") the 8-Ball's next answer.
 
 =over
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 Ported from Auto 1.0.
 

modules/Eval.pm

@@ -0,0 +1,106 @@
+# Module: Eval. See below for documentation.
+# Copyright (C) 2010-2011 Xelhua Development Group, et al.
+# This program is free software; rights to this code are stated in doc/LICENSE.
+package M::Eval;
+use strict;
+use warnings;
+use English qw(-no_match_vars);
+use API::Std qw(cmd_add cmd_del trans);
+use API::IRC qw(privmsg notice);
+
+# Initialization subroutine.
+sub _init {
+    # Create the EVAL command.
+    cmd_add('EVAL', 2, 'cmd.eval', \%M::Eval::HELP_EVAL, \&M::Eval::cmd_eval) or return;
+
+    # Success.
+    return 1;
+}
+
+# Void subroutine.
+sub _void {
+    # Delete the EVAL command.
+    cmd_del('EVAL') or return;
+
+    # Success.
+    return 1;
+}
+
+# Help hash for EVAL command. Spanish, German and French translations are needed.
+our %HELP_EVAL = (
+    'en' => "This command allows you to eval Perl code. USE WITH CAUTION. \2Syntax:\2 EVAL <expression>",
+);
+
+# Callback for EVAL command.
+sub cmd_eval {
+    my ($src, @argv) = @_;
+
+    # Check for needed parameter.
+    if (!defined $argv[0]) {
+        notice($src->{svr}, $src->{nick}, trans('Not enough parameters').q{.});
+        return;
+    }
+
+    # Evaluate the expression and return the result.
+    my $expr = join ' ', @argv;
+    my $result = eval($expr);
+    if (!defined $result) { $result = 'None'; }
+    if ($EVAL_ERROR) {
+        $result = $EVAL_ERROR;
+        $result =~ s/(\r|\n)//gxsm;
+    }
+
+    # Return the result.
+    if (!defined $src->{chan}) {
+        notice($src->{svr}, $src->{nick}, "Output: $result");
+    }
+    else {
+        privmsg($src->{svr}, $src->{chan}, "$src->{nick}: $result");
+    }
+
+    return 1;
+}
+
+
+# Start initialization.
+API::Std::mod_init('Eval', 'Xelhua', '1.01', '3.0.0a6', __PACKAGE__);
+# vim: set ai et sw=4 ts=4:
+# build: perl=5.010000
+
+__END__
+
+=head1 NAME
+
+Eval - Allows you to evaluate Perl code from IRC
+
+=head1 VERSION
+
+ 1.01
+
+=head1 SYNOPSIS
+
+ >blue< eval 1;
+ -blue- Output: 1
+
+=head1 DESCRIPTION
+
+This module adds the EVAL command which allows you to evaluate Perl code from
+IRC, returning the output via notice.
+
+This command requires the cmd.eval privilege.
+
+This module is compatible with Auto v3.0.0a6+.
+
+=head1 AUTHOR
+
+This module was written by Elijah Perrault.
+
+This module is maintained by Xelhua Development Group.
+
+=head1 LICENSE AND COPYRIGHT
+
+This module is Copyright 2010-2011 Xelhua Development Group.
+
+This module is released under the same licensing terms as Auto itself.
+
+=cut

modules/FML.pm

@@ -67,8 +67,8 @@ sub fml
 }
 
 # Start initialization.
-API::Std::mod_init('FML', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('FML', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent perl=5.010000
 
 __END__
@@ -110,7 +110,7 @@ have my hand back?" FML
 This module adds an extra dependency: LWP::UserAgent. You can get it from
 the CPAN <http://www.cpan.org>.
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 Ported from Auto 2.0.
 

modules/Greet.pm

@@ -125,8 +125,8 @@ sub hook_rcjoin
 }
 
 # Start initialization.
-API::Std::mod_init('Greet', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('Greet', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
@@ -154,6 +154,6 @@ user that has a greet in the database joins a channel the bot is in.
 
 =over
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 =back

modules/HelloChan.pm

@@ -36,8 +36,8 @@ sub hello
 
 
 # Start initialization.
-API::Std::mod_init('HelloChan', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('HelloChan', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__

modules/IsItUp.pm

@@ -69,8 +69,8 @@ sub check
 }
 
 # Start initialization.
-API::Std::mod_init('IsItUp', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('IsItUp', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent perl=5.010000
 
 __END__
@@ -110,6 +110,6 @@ appears up or down to Auto.
 This module requires LWP::UserAgent. You can get it from
 the CPAN <http://www.cpan.org>.
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 =back

modules/LinkTitle.pm

@@ -66,8 +66,8 @@ sub gettitle
 }
 
 # Start initialization.
-API::Std::mod_init('LinkTitle', 'Xelhua', '1.00', '3.0.0a5', __PACKAGE__);
+API::Std::mod_init('LinkTitle', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,HTML::Entities perl=5.010000
 
 __END__

modules/QDB.pm

@@ -211,8 +211,8 @@ sub cmd_qdb
 }
 
 
-API::Std::mod_init('QDB', 'Xelhua', '1.02', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('QDB', 'Xelhua', '1.02', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__

modules/SASLAuth.pm

@@ -14,18 +14,20 @@ use API::IRC qw(privmsg);
 sub _init
 {
     # Check if this Auto was built with SASL support.
-    err(2, "Auto was not built with SASL support. Aborting SASLAuth.", 0) and return 0 if $Auto::ENFEAT !~ /sasl/;
+    if ($Auto::ENFEAT !~ m/sasl/xsm) { err(2, 'Auto was not built with SASL support. Aborting SASLAuth.', 0) and return; }
-    # Add a hook for before we connect.
+    # Add sasl to supported CAP for servers configured with SASL.
-    hook_add('on_preconnect', 'CAP', sub { my ($srv) = @_; Auto::socksnd($srv, 'CAP LS'); }
+    my %servers = conf_get('server');
-    ) or return 0;
+    foreach my $svr (keys %servers) {
-    # Hook for parsing CAP.
+        if (conf_get("server:$svr:sasl_username")) { $Proto::IRC::cap{$svr} .= ' sasl'; }
-    rchook_add('CAP', \&M::SASLAuth::handle_cap) or return 0;
+    }
+    # Hook for when CAP ACK sasl is received.
+    hook_add('on_capack', 'sasl.cap', \&M::SASLAuth::handle_capack) or return;
     # Hook for parsing 903.
-    rchook_add('903', \&M::SASLAuth::handle_903) or return 0;
+    rchook_add('903', \&M::SASLAuth::handle_903) or return;
     # Hook for parsing 904.
-    rchook_add('904', \&M::SASLAuth::handle_904) or return 0;
+    rchook_add('904', \&M::SASLAuth::handle_904) or return;
     # Hook for parsing 906.
-    rchook_add('906', \&M::SASLAuth::handle_906) or return 0;
+    rchook_add('906', \&M::SASLAuth::handle_906) or return;
     return 1;
 }
 
@@ -33,42 +35,21 @@ sub _init
 sub _void
 {
     # Delete the hooks.
-    hook_del("on_preconnect", "CAP") or return 0;
+    hook_del('on_capack') or return;
-    rchook_del('CAP');
+    rchook_del('903') or return;
-    rchook_del('903');
+    rchook_del('904') or return;
-    rchook_del('904');
+    rchook_del('906') or return;
-    rchook_del('906');
     return 1;
 }
 
-sub handle_cap {
+sub handle_capack {
-    my ($srv, @parv) = @_;
+    my (($svr, $sacap)) = @_;
-    my $line = join(' ',@parv);
+ 
-    my ($tosend);
+    if ($sacap eq 'sasl') {
-    
+        Auto::socksnd($svr, 'AUTHENTICATE PLAIN');
-    given ($line) {
+        timer_add('auth_timeout_'.$svr, 1, (conf_get("server:$svr:sasl_timeout"))[0][0], sub { Auto::socksnd($svr, 'CAP END'); });
-        when (/ LS /) {
-            $tosend .= 'multi-prefix ' if $line =~ /multi-prefix/i;
-            $tosend .= 'sasl ' if $line =~ /sasl/ and conf_get("server:$srv:sasl_username");
-            awarn(2, "SASL is unavailable on this server.") if $tosend !~ /sasl/;
-            if ($tosend eq '') { Auto::socksnd($srv, 'CAP END') }
-            else { Auto::socksnd($srv, "CAP REQ :$tosend"); }
-        }
-        when (/ ACK /) {
-            if ( $line =~ /sasl/) {
-                Auto::socksnd($srv, 'AUTHENTICATE PLAIN');
-                timer_add('auth_timeout', 1, (conf_get("server:$srv:sasl_timeout"))[0][0], sub { Auto::socksnd($srv, 'CAP END'); });
-            }
-            else {
-                Auto::socksnd($srv, 'CAP END');
-                awarn(2, "SASL authentication failed at ACK");
-            }
-        }
-        when (/ NAK /) {
-            Auto::socksnd($srv, 'CAP END');
-            awarn(2, "SASL authentication failed. Server refused ".$tosend);
-        }
     }
+    
     return 1;
 }
 
@@ -105,8 +86,8 @@ sub handle_authenticate
 sub handle_903 
 { 
     my ($srv, undef) = @_; 
-    Auto::socksnd($srv, 'CAP END');
+    timer_add('cap_end_'.$srv, 1, 2, sub { Auto::socksnd($srv, 'CAP END') });
-    timer_del('auth_timeout');
+    timer_del('auth_timeout_'.$srv);
 }
 
 # Parse: Numeric:904
@@ -114,8 +95,8 @@ sub handle_903
 sub handle_904 
 { 
     my ($srv, undef) = @_; 
-    Auto::socksnd($srv, 'CAP END');
+    timer_add('cap_end_'.$srv, 1, 2, sub { Auto::socksnd($srv, 'CAP END') });
-    timer_del('auth_timeout');
+    timer_del('auth_timeout_'.$srv);
     awarn(2, "SASL authentication failed!");
 }
 
@@ -124,14 +105,14 @@ sub handle_904
 sub handle_906 
 {
     my ($svr, undef) = @_;
-    Auto::socksnd($svr, 'CAP END');
+    timer_add('cap_end_'.$svr, 1, 2, sub { Auto::socksnd($svr, 'CAP END') });
-    timer_del('auth_timeout');
+    timer_del('auth_timeout_'.$svr);
     awarn(2, "SASL authentication aborted!");
 }
 
 # Start initialization.
-API::Std::mod_init('SASLAuth', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('SASLAuth', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
@@ -188,6 +169,6 @@ block(s) you wish to use SASL with:
 This adds an extra dependency: You must build Auto with the 
 --enable-sasl option.
 
-This module is compatible with Auto v3.0.0a4+.
+This module is compatible with Auto v3.0.0a6+.
 
 =back

modules/Weather.pm

@@ -78,8 +78,8 @@ sub weather
 }
 
 # Start initialization.
-API::Std::mod_init('Weather', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
+API::Std::mod_init('Weather', 'Xelhua', '1.00', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,XML::Simple perl=5.010000
 
 __END__
@@ -121,6 +121,6 @@ From the NE at 9 MPH Gusting to 22 MPH Conditions: Overcast
 This module requires LWP::UserAgent and XML::Simple. Both are 
 obtainable from CPAN <http://www.cpan.org>.
 
-This module is compatible with Auto version 3.0.0a4+.
+This module is compatible with Auto version 3.0.0a6+.
 
 =back

scripts/licenses.pl

@@ -0,0 +1,70 @@
+# OSI-approved software licenses as of February 26, 2011.
+my %licenses = (
+    auto   => 'Same license as Auto itself',
+    afl    => 'Academic Free License',
+    agpl   => 'Affero GNU Public License',
+    apl    => 'Adaptive Public License',
+    apache => 'Apache License',
+    apsl   => 'Apple Public Source License',
+    art    => 'Artistic License',
+    aal    => 'Attribution Assurance License',
+    nbsd   => 'New BSD License',
+    sbsd   => 'Simplified BSD License',
+    bsl    => 'Boost Software License',
+    catosl => 'Computer Associates Trusted Open Source License',
+    cddl   => 'Common Development and Distribution License',
+    cpal   => 'Common Public Attribution License',
+    cua    => 'CUA Office Public License',
+    eudgsl => 'EU DataGrid Software License',
+    epl    => 'Eclipse Public License',
+    ecl    => 'Educational Community License',
+    efl    => 'Eiffel Forum License',
+    enpl   => 'Entessa Public License',
+    eupl   => 'European Union Public License',
+    fair   => 'Fair License',
+    fwl    => 'Frameworx License',
+    gpl2   => 'GNU General Public License v2',
+    gpl3   => 'GNU General Public License v3',
+    lgpl   => 'GNU Lesser General Public License',
+    ibm    => 'IBM Public License',
+    ipa    => 'IPA Font License',
+    isc    => 'ISC License',
+    lppl   => 'LaTeX Project Public License',
+    lpl    => 'Lucent Public License',
+    miros  => 'MirOS Licence',
+    mspl   => 'Microsoft Public License',
+    msrl   => 'Microsoft Reciprocal License',
+    mit    => 'MIT License',
+    msl    => 'Motosoto License',
+    mpl    => 'Mozilla Public License',
+    mtl    => 'Multics License',
+    nasa   => 'NASA Open Source Agreement',
+    ntpl   => 'NTP License',
+    naumen => 'Naumen Public License',
+    nhgpl  => 'Nethack General Public License',
+    nosl   => 'Nokia Open Source License',
+    nposl  => 'Non-Profit Open Software License',
+    oclc   => 'OCLC Research Public License',
+    ofl    => 'Open Font License',
+    ogtsl  => 'Open Group Test Suite License',
+    osl    => 'Open Software License',
+    php    => 'PHP License',
+    pgsql  => 'The PostgreSQL License',
+    python => 'Python License',
+    pysfl  => 'Python Software Foundation License',
+    qpl    => 'Qt Public License',
+    real   => 'RealNetworks Public Source License',
+    rpl    => 'Reciprocal Public License',
+    rscpl  => 'Ricoh Source Code Public License',
+    simple => 'Simple Public License',
+    scl    => 'Sleepycat License',
+    spl    => 'Sun Public License',
+    sowpl  => 'Sybase Open Watcom Public License',
+    ncsa   => 'University of Illinois/NCSA Open Source License',
+    vsl    => 'Vovida Software License',
+    w3c    => 'W3C License',
+    wxwll  => 'wxWindows Library License',
+    xnet   => 'X.Net License',
+    zpl    => 'Zope Public License',
+    zlib   => 'zlib/libpng license'
+);