some refactoring

[NDIRC.git] / Access.pm

diff --git a/Access.pm b/Access.pm
index 77f88cb047fe13a018d38e1b37cc5abccfe75849..03851bb382de69e33b08ba0f0d0851d4ab68ed26 100644 (file)
--- a/Access.pm
+++ b/Access.pm
@@ -23,8 +23,11 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/officer dc bc hc scanner intel masterop masterinvite/;
+our @EXPORT = qw/member officer dc bc hc scanner intel masterop masterinvite/;
 
+sub member {
+       return groupmember("HM");
+};
 sub officer {
        return groupmember("HO");
 };
@@ -54,9 +57,10 @@ sub masterinvite {
 sub groupmember {
        my ($groups) = @_;
        $groups = join ",", map {"'$_'"} split //, $groups;
-       my $f = $ND::DBH->prepare("SELECT uid,username FROM users NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag IN ('T',$groups) AND lower(hostmask) = ?");
+       my $f = $ND::DBH->prepare("SELECT uid,username FROM users NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag IN ('T',$groups) AND lower(hostmask) = ?") or print $ND::DBH->errstr;
        $f->execute(lc($ND::address));
-       return $f->fetchrow_hashref;
+       my $user = $f->fetchrow_hashref;
+       return $user;
 };
 
 1;