Use new password infrastructure

[NDIRC.git] / Commands / Usermgm.pm

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 88a222ebfa9e87ff9243e63ba62ca1359cab90ba..a5e3abf8a70ff478cc01e5ac9640b112e2760722 100644 (file)
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -26,6 +26,7 @@ use NDIRC::Dispatcher;
 
 command '+user' => {
        help => q(syntax: .+user username [pnick] | username must be alphanum characters, if no pnick is given then it will be set to the same as username),
+       type => q(usermgmt),
        acl => 'irc_adduser'
 }, class extends NDIRC::Command {
        method execute ($c,$msg) {
@@ -44,7 +45,7 @@ FROM users WHERE username = $1 OR hostmask = $2 OR pnick = $3
                        $c->reply("<b>$username ($p_nick)</b> already exists with host: <b>$hostname</b>");
                }else{
                        $dbh->do(q{
-INSERT INTO users (username,hostmask,pnick,password) VALUES(?,?,?,'')
+INSERT INTO users (username,hostmask,pnick) VALUES($1,$2,$3)
                                },undef,$nick,$host,$pnick);
                        $c->reply("Added <b>$nick(/$pnick)</b> with host: <b>$host</b>");
                }
@@ -53,6 +54,7 @@ INSERT INTO users (username,hostmask,pnick,password) VALUES(?,?,?,'')
 
 command '-user' => {
        help => q(syntax: .-user nick | nick must be alphanum characters, if no pnick is given then it will be set to nick),
+       type => q(usermgmt),
        acl => 'irc_deactivateuser'
 }, class extends NDIRC::Command {
        method execute ($c,$msg) {
@@ -65,7 +67,7 @@ command '-user' => {
 
                if ($f->rows == 1){
                        my $updated = $dbh->do(q{
-UPDATE users SET hostmask = ?, password = '' WHERE uid = ?
+UPDATE users SET hostmask = $1, password = NULL WHERE uid = $2
                                },undef,$username,$uid);
                        if ($updated > 0){
                                my $groups = $dbh->do(q{DELETE FROM groupmembers WHERE uid = ?},undef,$uid);
@@ -85,6 +87,7 @@ UPDATE users SET hostmask = ?, password = '' WHERE uid = ?
 
 command chattr => {
        help => q(syntax: .chattr username [-]flags | % can be used for wildcards \%arro% will match barrow, if a - is given then flags will be removed, otherwise added),
+       type => q(usermgmt),
        acl => 'irc_chattr'
 }, class extends NDIRC::Command {
        method execute ($c,$msg) {
@@ -423,10 +426,10 @@ my $points = class extends NDIRC::Command {
        method execute ($c,$msg) {
                my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(:?\d+|\d*\.\d+)))?$/ or die 'ARGS';
 
-               return unless $self->check($c,$nick,$points);
-
                $points //= 1;
 
+               return unless $self->check($c,$nick,$points);
+
                my $dbh = $c->model;
 
                if ($points*$points > 400){
@@ -523,7 +526,7 @@ command getanti => {
                my $f = $dbh->prepare(q{
 SELECT username, ship, amount, CASE WHEN $1 = t1 THEN 't1' ELSE 't2' END AS t
 FROM available_ships a
-       JOIN ship_stats s ON (a.ship = s.name)
+       JOIN ship_stats s USING (ship)
 WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
        AND class = ANY($2)
        AND $1 IN (t1,t2)