merge error on can_do. replace en toto from 0.4.3

git-svn-id: http://svn.tabris.net/repos/srsv@3536 70d4eda1-72e9-0310-a436-91e5bd24443c

diff --git a/branches/0.5.0/modules/serviceslibs/chanserv.pm b/branches/0.5.0/modules/serviceslibs/chanserv.pm
index 0103253574f6556d62cb802b04fd4639f5f8b226..4edb2d4c437c1a278b851b72faa976d19dabdf59 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/chanserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/chanserv.pm
@@ -4301,6 +4301,7 @@ sub can_do($$$;$) {
        my $noreply = $data->{NOREPLY};
        my $acc = $data->{ACC};
        my $overrideMsg = $data->{OVERRIDE_MSG};
+
        if(my $nick = __can_do($chan, $perm, $user, $acc)) {
                # This is becoming increasingly complicated
                # and checking if an override was used is becoming tricky.
@@ -4334,27 +4335,10 @@ sub can_do($$$;$) {
 
 sub __can_do($$$;$) {
        my ($chan, $perm, $user, $acc) = @_;
-       if(my ($nick, undef) = __can_do($chan, $perm, $acc, $user, $noreply)) {
-               return (wantarray ? ($nick, 0) : $nick);
-       } elsif ( $user and adminserv::is_svsop($user, adminserv::S_HELP()) ) { 
-               #$set_lastused->execute($cn, get_user_id($user));
-               my ($nick, $override) = check_override($user, $perm);
-               if(services_conf_log_overrides && $override) {
-               # FIXME: This doesn't log enough information, and likely needs to be pushed up in the call-chain
-                       my $src = get_user_nick($user);
-                       my $cn = $chan->{CHAN};
-                       wlog($csnick, LOG_INFO(), "\002$src\002 used override \002$perm\002 on \002$cn\002");
-               }
-               return (wantarray ? ($nick, $override) : $nick) if $override;
-       }
-       return 0;
-}
-
-sub __can_do($$$;$$) {
-       my ($chan, $perm, $acc, $user, $noreply) = @_;
        my $nick;
        my $cn = $chan->{CHAN};
        $perm = uc $perm;
+
        my $level;
        unless(exists($chan->{"PERM::$perm"})) {
                $level = $chan->{"PERM::$perm"} = get_level($chan, $perm);
@@ -4375,7 +4359,7 @@ sub __can_do($$$;$$) {
                }
        }
        $nick = 1 unless $nick;
-       print "ACcc $acc $level\n";
+
        if($acc >= $level and !cr_chk_flag($chan, (CRF_CLOSE | CRF_FREEZE | CRF_DRONE))) {
                set_lastused($cn, get_user_id($user)) if $user;
                return (wantarray ? ($nick, 0) : $nick);