- Applied patch from Morten. Thanks.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@724 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/blootbot/src/CommandStubs.pl b/blootbot/src/CommandStubs.pl
index b7d598416851a7a6db28320755b03172383a732c..47dc9d3325d5b25cdcb2deac32f14699e259065f 100644 (file)
--- a/blootbot/src/CommandStubs.pl
+++ b/blootbot/src/CommandStubs.pl
@@ -341,7 +341,7 @@ sub Modules {
                # this is way fucking ugly.
 
                my %hash = &sqlSelectColHash("stats", "nick,counter",
-                       undef,
+                       { },
                        $where." ORDER BY counter DESC LIMIT 3", 1
                );
                my $i;

diff --git a/blootbot/src/Files.pl b/blootbot/src/Files.pl
index 75c52a1ffd4d5a898feec1dd95d64bfe6f1bc245..a3dae2e407581d71d867f0d1904b97bbdf78289d 100644 (file)
--- a/blootbot/src/Files.pl
+++ b/blootbot/src/Files.pl
@@ -48,7 +48,7 @@ sub loadLang {
     close FILE;
 
     $file =~ s/^.*\///;
-    &status("Loaded lang $file ($langCount items)");
+    &status("Loaded $file ($langCount items)");
 }
 
 # File: Irc Servers list.
@@ -77,7 +77,7 @@ sub loadIRCServers {
     close FILE;
 
     $file =~ s/^.*\///;
-    &status("Loaded ircServers $file (". scalar(@ircServers) ." servers)");
+    &status("Loaded $file (". scalar(@ircServers) ." servers)");
 }
 
 1;

diff --git a/blootbot/src/dbi.pl b/blootbot/src/dbi.pl
index cd2bd353cede37fb915ceb1c4c6302ea17344b31..e0f48c4741c7053b47acb74b9ae1b75861533f64 100644 (file)
--- a/blootbot/src/dbi.pl
+++ b/blootbot/src/dbi.pl
@@ -39,8 +39,8 @@ sub sqlOpenDB {
     if ($dbh && !$dbh->err) {
        &status("Opened $type connection$hoststr");
     } else {
-       &ERROR("cannot connect$hoststr.");
-       &ERROR("since $type is not available, shutting down bot!");
+       &ERROR("Cannot connect$hoststr.");
+       &ERROR("Since $type is not available, shutting down bot!");
        &ERROR( $dbh->errstr ) if ($dbh);
        &closePID();
        &closeSHM($shm);
@@ -579,7 +579,7 @@ sub searchTable {
     return @results;
 }
 
-sub dbCreateTable {
+sub sqlCreateTable {
     my($table) = @_;
     my(@path)  = ($bot_data_dir, ".","..","../..");
     my $found  = 0;
@@ -605,7 +605,7 @@ sub dbCreateTable {
     if (!$found) {
        return 0;
     } else {
-       &sqlRaw("dbcreateTable($table)", $data);
+       &sqlRaw("sqlCreateTable($table)", $data);
        return 1;
     }
 }