Changeset 399

Timestamp:

05/11/10 14:59:27 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge updates/bugfixes to access-pwd-update.pl from r386. See #13.

File:

• trunk/cgi-bin/access-pwd-update.pl (modified) (3 diffs)

trunk/cgi-bin/access-pwd-update.pl

@@ -8 +8 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2007 - Kris Deugau
+# Copyright (C) 2007,2008 - Kris Deugau
 
 use strict;
 use warnings;
 use DBI;
+use lib '/var/www/ipdb.example.com/ip/cgi-bin/';
 use MyIPDB;
 
@@ -24 +25 @@
 
 my %userhash;
+my $passfile = "/var/www/ipdb.example.com/ip/.htpasswd";
 
-open HTPASS, "</var/www/ipdb.example.com/ip/.htpasswd";
+die ".htpasswd error:  file is empty!\n"
+        if -z $passfile;
+
+die ".htpasswd error:  file seems too small: ".(-s $passfile)."\n"
+        if (-s $passfile <3000);
+
+open HTPASS, "<$passfile";
 
 my $sth = $ip_dbh->prepare("select count(*) from users where username=?");
-
+my $sth2;
 while (<HTPASS>) {
   chomp;
@@ -37 +45 @@
   if ($data[0] == 0) {
     $sql = "insert into users (username,password) values ('$user','$pass')";
+    print "new user: $user\n";
   } else {
     $sql = "update users set password='$pass' where username='$user'";
   }
-  my $sth2 = $ip_dbh->prepare($sql);
+  $sth2 = $ip_dbh->prepare($sql);
   $sth2->execute or print "error executing $sql: ".$DBI::errstr."\n";
   $userhash{$user} = $pass;
 }
-my @userlist = @{ $ip_dbh->selectall_arrayref("select username from users") };
-$sth = $ip_dbh->prepare("delete from users where username=?");
-foreach my $user (@userlist) {
-  $sth->execute if !$userhash{$user}
-    or print "error deleting $user: ".$DBI::errstr."\n";
+
+# and now to delete users that have been removed
+$sth = $ip_dbh->prepare("select username,acl from users order by username");
+$sth2 = $ip_dbh->prepare("delete from users where username=?");
+$sth->execute;
+while (my @data = $sth->fetchrow_array()) {
+  if (!$userhash{$data[0]}) {
+    print "deleting $data[0] (acl $data[1])\n";
+    $sth2->execute($data[0])
+        or print "error deleting $data[0]: ".$DBI::errstr."\n";
+  }
 }