status() -> &status()

[infobot.git] / scripts / setup_users.pl

diff --git a/scripts/setup_users.pl b/scripts/setup_users.pl
index 3cde58ca8d232435b7efd7092d25af1f82dad5ad..9c1c200a97d74ab384b84e796f9c882d79a48d6c 100755 (executable)
--- a/scripts/setup_users.pl
+++ b/scripts/setup_users.pl
@@ -6,8 +6,12 @@
 require "src/core.pl";
 require "src/Misc.pl";
 require "src/logger.pl";
+require "src/modules.pl";
+$bot_src_dir = "./src";
+
+&loadConfig("files/blootbot.config");
+&loadDBModules();
 
-&loadConfig("files/infobot.config");
 my $dbname = $param{'DBName'};
 my $query;
 
@@ -17,28 +21,6 @@ if ($dbname eq "") {
 }
 
 if ($param{'DBType'} =~ /mysql/i) {
-    if (!scalar @ARGV) {
-       print "hi there.\n\n";
-
-       print "if you're running a new version of mysql (debian potato), run\n";
-       print "this script with the '1' parameter while '0' for older versions\n";
-       print "(debian slink).\n";
-       exit 0;
-    }
-
-    my $mysqlversion;
-    if ($ARGV[0] =~ /^\d+$/) {
-       if ($ARGV[0] == 0) {
-           $mysqlversion = 0;
-       } elsif ($ARGV[0] == 1) {
-           $mysqlversion = 1;
-       } else {
-           print "error: wrong integer?\n";
-       }
-    } else {
-       print "error: wrong argument?\n";
-       exit 1;
-    }
 
     print "Enter root information...\n";
     # username.
@@ -61,46 +43,40 @@ if ($param{'DBType'} =~ /mysql/i) {
     print "Step 1: Adding user information.\n";
 
     # open the db.
-    &openDB();
+    &openDB("mysql", $adminuser, $adminpass);
 
     # Step 2.
-    if (!&sqlGet("user","user",$param{'mysqlUser'},"user")) {
-       print "  Adding user $param{'mysqlUser'} $dbname/user table...\n";
+    if (!&dbGet("user","user",$param{'SQLUser'},"user")) {
+       print "  Adding user $param{'SQLUser'} $dbname/user table...\n";
 
        $query = "INSERT INTO user VALUES ".
-               "('localhost', '$param{'mysqlUser'}', ".
-               "password('$param{'mysqlPass'}'), ";
+               "('localhost', '$param{'SQLUser'}', ".
+               "password('$param{'SQLPass'}'), ";
 
-       if ($mysqlversion) {
-           $query .= "'Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N')";
-       } else {
-           $query .= "'Y','Y','Y','Y','N','N','N','N','N','N')";
-       }
+       $query .= "'Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N')";
+###    $query .= "'Y','Y','Y','Y','N','N','N','N','N','N')";
 
        &dbRaw("create(user)", $query);
     }
 
     # Step 3. what's this for?
-    if (!&sqlGet("db","db",$param{'mysqlUser'},"db")) {
+    if (!&dbGet("db","db",$param{'SQLUser'},"db")) {
        print "  Adding 'db' entry\n";
 
        $query = "INSERT INTO db VALUES ".
                "('localhost', '$dbname', ".
-               "'$param{'mysqlUser'}', ";
+               "'$param{'SQLUser'}', ";
 
-       if ($mysqlversion) {
-           $query .= "'Y','Y','Y','Y','Y','N','N','N','N','N')";
-       } else {
-           $query .= "'Y','Y','Y','Y','Y','N')";
-       }
+       $query .= "'Y','Y','Y','Y','Y','N','N','N','N','N')";
+###    $query .= "'Y','Y','Y','Y','Y','N')";
 
        &dbRaw("create(db)", $query);
     }
 
     # grant.
     print "  Granting user access to table.\n";
-    $query = "GRANT SELECT,INSERT,UPDATE,DELETE ON $dbname TO $param{'mysqlUser'}";
-    &dbRaw($query);
+    $query = "GRANT SELECT,INSERT,UPDATE,DELETE ON $dbname TO $param{'SQLUser'}";
+    &dbRaw("??", $query);
 
     # flush.
     print "Flushing privileges...\n";
@@ -113,7 +89,7 @@ if ($param{'DBType'} =~ /mysql/i) {
     &dbRaw("create(db $param{'DBName'})", $query);
 } elsif ($param{'DBType'} =~ /pg|postgres/i) {
     use Pg;
-    &openDB();
+#    &openDB();
 
     print "FIXME\n";
 }