sydney/Autobot
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
Elijah Perrault committed 2011-02-08 11:06:08 -07:00
1 parent a662c11f06
commit 34fd8b6e55
1 file changed
+20 -20
Download Patch File Download Diff File Expand all files Collapse all files
src/API/Std.pm
+20 -20
View File
@@ -44,17 +44,17 @@ sub mod_init
$MODULE{$name}{version} = $version; $MODULE{$name}{version} = $version;
$MODULE{$name}{author} = $author; $MODULE{$name}{author} = $author;
$MODULE{$name}{pkg} = $pkg; $MODULE{$name}{pkg} = $pkg;
API::Log::dbug('MODULES: '.$name.' successfully loaded.'); API::Log::dbug('MODULES: '.$name.' successfully loaded.');
API::Log::alog('MODULES: '.$name.' successfully loaded.'); API::Log::alog('MODULES: '.$name.' successfully loaded.');
return 1; return 1;
} }
else { else {
# Otherwise, return a failed to load message. # Otherwise, return a failed to load message.
API::Log::dbug('MODULES: Failed to load '.$name.q{.}); API::Log::dbug('MODULES: Failed to load '.$name.q{.});
API::Log::alog('MODULES: Failed to load '.$name.q{.}); API::Log::alog('MODULES: Failed to load '.$name.q{.});
return; return;
} }
} }
@@ -79,7 +79,7 @@ sub mod_void
API::Log::alog('MODULES: Attempting to unload module: '.$module.'...'); API::Log::alog('MODULES: Attempting to unload module: '.$module.'...');
# Check if this module exists. # Check if this module exists.
unless (defined $MODULE{$module}) { if (!defined $MODULE{$module}) {
API::Log::dbug('MODULES: Failed to unload '.$module.'. No such module?'); API::Log::dbug('MODULES: Failed to unload '.$module.'. No such module?');
API::Log::alog('MODULES: Failed to unload '.$module.'. No such module?'); API::Log::alog('MODULES: Failed to unload '.$module.'. No such module?');
return; return;
@@ -145,8 +145,8 @@ sub event_add
{ {
my ($name) = @_; my ($name) = @_;
if (!defined $EVENTS{lc($name)}) { if (!defined $EVENTS{lc $name}) {
$EVENTS{lc($name)} = 1; $EVENTS{lc $name} = 1;
return 1; return 1;
} }
else { else {
@@ -160,9 +160,9 @@ sub event_del
{ {
my ($name) = @_; my ($name) = @_;
if (defined $EVENTS{lc($name)}) { if (defined $EVENTS{lc $name}) {
delete $EVENTS{lc($name)}; delete $EVENTS{lc $name};
delete $HOOKS{lc($name)}; delete $HOOKS{lc $name};
return 1; return 1;
} }
else { else {
@@ -291,7 +291,7 @@ sub conf_get
# Create an array out of the value. # Create an array out of the value.
my @val; my @val;
if ($value =~ m/:/) { if ($value =~ m/:/) {
@val = split ':', $value; @val = split m/[:]/, $value;
} }
else { else {
@val = ($value); @val = ($value);
@@ -300,7 +300,7 @@ sub conf_get
undef $value; undef $value;
# Get the count of elements in the array. # Get the count of elements in the array.
my $count = scalar(@val); my $count = scalar @val;
# Return the requested configuration value(s). # Return the requested configuration value(s).
if ($count == 1) { if ($count == 1) {
@@ -353,8 +353,8 @@ sub match_user
my (%user) = @_; my (%user) = @_;
# Get data from config. # Get data from config.
if (!conf_get("user")) { return; } if (!conf_get('user')) { return; }
my %uhp = conf_get("user"); my %uhp = conf_get('user');
foreach my $userkey (keys %uhp) { foreach my $userkey (keys %uhp) {
# For each user block. # For each user block.
@@ -362,23 +362,23 @@ sub match_user
foreach my $uhk (keys %ulhp) { foreach my $uhk (keys %ulhp) {
# For each user. # For each user.
if ($uhk eq "net") { if ($uhk eq 'net') {
if (defined $user{svr}) { if (defined $user{svr}) {
if (lc $user{svr} ne lc ($ulhp{$uhk})[0][0]) { if (lc $user{svr} ne lc(($ulhp{$uhk})[0][0])) {
# config.user:net conflicts with irc.user:svr. # config.user:net conflicts with irc.user:svr.
last; last;
} }
} }
} }
elsif ($uhk eq "mask") { elsif ($uhk eq 'mask') {
# Put together the user information. # Put together the user information.
my $mask = $user{nick}."!".$user{user}."@".$user{host}; my $mask = $user{nick}.q{!}.$user{user}.q{@}.$user{host};
if (API::IRC::match_mask($mask, ($ulhp{$uhk})[0][0])) { if (API::IRC::match_mask($mask, ($ulhp{$uhk})[0][0])) {
# We've got a host match. # We've got a host match.
return $userkey; return $userkey;
} }
} }
elsif ($uhk eq "chanstatus" and defined $ulhp{'net'}) { elsif ($uhk eq 'chanstatus' and defined $ulhp{'net'}) {
my ($ccst, $ccnm) = split ':', ($ulhp{$uhk})[0][0]; my ($ccst, $ccnm) = split ':', ($ulhp{$uhk})[0][0];
my $svr = $ulhp{net}[0]; my $svr = $ulhp{net}[0];
if (defined $Auto::SOCKET{$svr}) { if (defined $Auto::SOCKET{$svr}) {
@@ -405,10 +405,10 @@ sub has_priv
if (conf_get("user:$cuser:privs")) { if (conf_get("user:$cuser:privs")) {
my $cups = (conf_get("user:$cuser:privs"))[0][0]; my $cups = (conf_get("user:$cuser:privs"))[0][0];
if (defined $Auto::PRIVILEGES{$cups}) { if (defined $Auto::PRIVILEGES{$cups}) {
foreach (@{ $Auto::PRIVILEGES{$cups} }) { foreach (@{ $Auto::PRIVILEGES{$cups} }) {
if ($_ eq $cpriv or $_ eq "ALL") { return 1; } if ($_ eq $cpriv or $_ eq 'ALL') { return 1; }
} }
} }
} }