gmtime

[infobot.git] / src / Modules / Factoids.pl

diff --git a/src/Modules/Factoids.pl b/src/Modules/Factoids.pl
index fb261d4d04e4bd52da762fa730c2ba8288061ea5..7b1ac1446010d76c9d3aebb3593cf1004e4a7419 100644 (file)
--- a/src/Modules/Factoids.pl
+++ b/src/Modules/Factoids.pl
@@ -5,7 +5,10 @@
 #     Splitted: SQLExtras.pl
 #
 
-if (&IsParam("useStrict")) { use strict; }
+use strict;
+
+use vars qw($dbh $who);
+use vars qw(%param);
 
 ###
 # Usage: &CmdFactInfo($faqtoid, $query);
@@ -19,16 +22,10 @@ sub CmdFactInfo {
        return;
     }
 
-    my $i = 0;
-    my %factinfo;
-    my @factinfo = &getFactInfo($faqtoid,"*");
-    foreach ( &dbGetColInfo("factoids") ) {
-       $factinfo{$_} = $factinfo[$i] || '';
-       $i++;
-    }
+    my %factinfo = &dbGetColNiceHash("factoids", "*", "factoid_key=".&dbQuote($faqtoid));
 
     # factoid does not exist.
-    if (scalar @factinfo <= 1) {
+    if (scalar (keys %factinfo) <= 1) {
        &performReply("there's no such factoid as \002$faqtoid\002");
        return;
     }
@@ -55,7 +52,7 @@ sub CmdFactInfo {
        if ($time) {
            if (time() - $time > 60*60*24*7) {
                my $days = int( (time() - $time)/60/60/24 );
-               $string .= " at \037". scalar(localtime $time). "\037" .
+               $string .= " at \037". scalar(gmtime $time). "\037" .
                                " ($days days)";
            } else {
                $string .= " ".&Time2String(time() - $time)." ago";
@@ -66,28 +63,28 @@ sub CmdFactInfo {
     }
 
     # modified:
-#    if ($factinfo{'modified_by'}) {
-#      $string = "last modified";
-#
-#      my $time = $factinfo{'modified_time'};
-#      if ($time) {
-#          if (time() - $time > 60*60*24*7) {
-#              $string .= " at \037". scalar(localtime $time). "\037";
-#          } else {
-#              $string .= " ".&Time2String(time() - $time)." ago";
-#          }
-#      }
-#
-#      my @x;
-#      foreach (split ",", $factinfo{'modified_by'}) {
-#          /\!/;
-#          push(@x, $`);
-#      }
-#      $string .= "by ".&IJoin(@x);
-#
-#      $i++;
-#      push(@array,$string);
-#    }
+    if ($factinfo{'modified_by'}) {
+       $string = "last modified";
+
+       my $time = $factinfo{'modified_time'};
+       if ($time) {
+           if (time() - $time > 60*60*24*7) {
+               $string .= " at \037". scalar(gmtime $time). "\037";
+           } else {
+               $string .= " ".&Time2String(time() - $time)." ago ";
+           }
+       }
+
+       my @x;
+       foreach (split ",", $factinfo{'modified_by'}) {
+           /\!/;
+           push(@x, $`);
+       }
+       $string .= "by ".&IJoin(@x);
+
+       $i++;
+       push(@array,$string);
+    }
 
     # requested:
     if ($factinfo{'requested_by'}) {
@@ -112,7 +109,7 @@ sub CmdFactInfo {
        my $requested_time = $factinfo{'requested_time'};
        if ($requested_time) {
            if (time() - $requested_time > 60*60*24*7) {
-               $string .= " at \037". scalar(localtime $requested_time). "\037";
+               $string .= " at \037". scalar(gmtime $requested_time). "\037";
            } else {
                $string .= ", ".&Time2String(time() - $requested_time)." ago";
            }
@@ -174,14 +171,14 @@ sub CmdFactStats {
        my $prefix = "factoid statistics by author: ";
        return &formListReply(0, $prefix, @list);
 
-    } elsif ($type =~ /^broken$/i) {
-        &status("factstats(broken): starting...");
+    } elsif ($type =~ /^vandalism$/i) {
+        &status("factstats(vandalism): starting...");
        my $start_time  = &timeget();
        my %data        = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL");
        my @list;
 
        my $delta_time  = &timedelta($start_time);
-        &status(sprintf("factstats(broken): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0);
+        &status(sprintf("factstats(vandalismbroken): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0);
        $start_time     = &timeget();
 
        # parse the factoids.
@@ -193,15 +190,15 @@ sub CmdFactStats {
        }
 
        $delta_time     = &timedelta($start_time);
-        &status(sprintf("factstats(broken): %.02f sec to complete.", $delta_time)) if ($delta_time > 0);
+        &status(sprintf("factstats(vandalism): %.02f sec to complete.", $delta_time)) if ($delta_time > 0);
 
        # bail out on no results.
        if (scalar @list == 0) {
-           return 'no broken factoids... wooohoo.';
+           return 'no vandalised factoids... wooohoo.';
        }
 
        # parse the results.
-       my $prefix = "broken factoid ";
+       my $prefix = "Vandalised factoid ";
        return &formListReply(1, $prefix, @list);
 
     } elsif ($type =~ /^total$/i) {
@@ -277,7 +274,7 @@ sub CmdFactStats {
        for (@list) {
            my $factoid = $_;
            my $val = &getFactInfo($factoid, "factoid_value");
-           if ($val =~ /^<REPLY> see( also)? (.*?)\.?$/i) {
+           if ($val =~ /^<REPLY> ?see( also)? (.*?)\.?$/i) {
                my $redirf = lc $2;
                my $redir = &getFactInfo($redirf, "factoid_value");
                next if (defined $redir);
@@ -588,7 +585,7 @@ sub CmdFactStats {
        my @list;
        my $total       = 0;
        my $users       = 0;
-       foreach $rate (sort { $a <=> $b } keys %hash) {
+       foreach $rate (sort { $b <=> $a } keys %hash) {
            my $f       = join(", ", sort keys %{ $hash{$rate} });
            my $str     = "$f - ".&Time2String($rate);
            $str        =~ s/\002//g;
@@ -677,6 +674,7 @@ sub CmdFactStats {
 
     } elsif ($type =~ /^(2|too)long$/i) {
        my @list;
+       my $query;
 
        # factoid_key.
        $query = "SELECT factoid_key FROM factoids WHERE length(factoid_key) >= $param{'maxKeySize'}";
@@ -685,14 +683,16 @@ sub CmdFactStats {
        while (my @row = $sth->fetchrow_array) {
            push(@list,$row[0]);
        }
+       $sth->finish;
 
        # factoid_value.
-       my $query = "SELECT factoid_key,factoid_value FROM factoids WHERE length(factoid_value) >= $param{'maxDataSize'}";
+       $query = "SELECT factoid_key,factoid_value FROM factoids WHERE length(factoid_value) >= $param{'maxDataSize'}";
        $sth = $dbh->prepare($query);
        $sth->execute;
        while (my @row = $sth->fetchrow_array) {
            push(@list,sprintf("\002%s\002 - %s", length($row[1]), $row[0]));
        }
+       $sth->finish;
 
        if (scalar @list == 0) {
            return "good. no factoids exceed length.";