Changeset 183 for trunk/dns.cgi

Timestamp:

12/05/11 17:16:27 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix minor error-log mess due to nonexistent username on login (see #25)

File:

• trunk/dns.cgi (modified) (1 diff)

trunk/dns.cgi

@@ -202 +202 @@
     my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
     $sth->execute($webvar{username});
-    my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array;
-    $webvar{loginfailed} = 1 if !defined($uid);
-
-    if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
-      # native passwords (crypt-md5)
-      $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
-    } elsif ($pass =~ /^[0-9a-f]{32}$/) {
-      # VegaDNS import (hex-coded MD5)
-      $webvar{loginfailed} = 1 if $pass ne md5_hex($webvar{password});
+
+    if (my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array) {
+      $webvar{password} = '' if !$webvar{password};
+
+      if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
+        # native passwords (crypt-md5)
+        $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
+      } elsif ($pass =~ /^[0-9a-f]{32}$/) {
+        # VegaDNS import (hex-coded MD5)
+        $webvar{loginfailed} = 1 if $pass ne md5_hex($webvar{password});
+      } else {
+        # plaintext (convenient now and then)
+        $webvar{loginfailed} = 1 if $pass ne $webvar{password};
+      }
+
+      # set session bits
+      $session->param('logingroup',$gid);
+      $session->param('curgroup',$gid);
+      $session->param('uid',$uid);
+      $session->param('username',$webvar{username});
+
+      changepage(page => "domlist") if !defined($webvar{loginfailed});
+
     } else {
-      # plaintext (convenient now and then)
-      $webvar{loginfailed} = 1 if $pass ne $webvar{password};
-    }
-
-    # set session bits
-    $session->param('logingroup',$gid);
-    $session->param('curgroup',$gid);
-    $session->param('uid',$uid);
-    $session->param('username',$webvar{username});
-
-    changepage(page => "domlist") if !defined($webvar{loginfailed});
+      $webvar{loginfailed} = 1;
+    } # user data fetch check
+
   } elsif ($webvar{action} eq 'logout') {
     # delete the session