Fix up issues

mostly syntax errors, but some stupid copy pasta errors.
SoylentNews · Mar 5, 2015 · 2f0594a · 2f0594a
1 parent 9ed7f1d
commit 2f0594a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/plugins/Admin/admin.pl b/plugins/Admin/admin.pl
@@ -2133,7 +2133,7 @@ sub displayModBombs {
 	my($form, $slashdb, $user, $constants) = @_;
 	my $moddb = getObject("Slash::$constants->{m1_pluginname}");
 
-	my $data = $moddb->getSpamMods($form->{mod_floor}, $form->{time_span});
+	my $data = $moddb->dispModBombs($form->{mod_floor}, $form->{time_span});
 
 	slashDisplay('modBomb', $data);
 }

diff --git a/plugins/Admin/templates/modBomb;admin;default b/plugins/Admin/templates/modBomb;admin;default
@@ -49,6 +49,21 @@ __template__
 	</table>
 </div>
 
+[% BLOCK link_ipid %]
+<a href="[% gSkin.rootdir %]/users.pl?op=userinfo&amp;userfield=[% ipid | strip_attribute %]&amp;fieldname=ipid">[% ipid_vis %]</a>
+[% END %] 
+
+[% BLOCK nick_and_uid;
+	nickname | strip_literal;
+	' (<a href="';
+	constants.real_rootdir;
+	'/users.pl?op=userinfo&amp;fieldname=uid&amp;userfield=';
+	uid;
+	'">';
+	uid;
+	'</a>)';
+END %]
+
 __seclev__
 10000
 __version__

diff --git a/plugins/Moderation/Moderation.pm b/plugins/Moderation/Moderation.pm
@@ -1247,12 +1247,12 @@ sub dispModBombs {
 
 	my $reasons = $self->getReasons();
 
-	my $order_col = $options->{order_col} || "uid2";
+	my $order_col = $options->{order_col} || "uid2,ts";
 
 	my $time_clause = "ts > DATE_SUB(NOW(), INTERVAL $time_span HOUR)";	
 
-	my $subquery = "(SELECT cuid as uid2 FROM moderatorlog WHERE val < 0 AND uid2 <> 1 AND $time_clause  GROUP BY uid2 HAVING COUNT(uid2) > $mod_floor)";
-	my $where_clause = "moderatorlog.uid=users.uid AND moderatorlog.cid=comments.cid AND val < 0 AND uid2 IN $subquery AND $time_clause";
+	my $subquery = "(SELECT cuid FROM moderatorlog WHERE val < 0 AND cuid <> 1 AND $time_clause  GROUP BY cuid HAVING COUNT(cuid) >= $mod_floor)";
+	my $where_clause = "moderatorlog.uid=users.uid AND moderatorlog.cid=comments.cid AND val < 0 AND moderatorlog.cuid IN $subquery AND $time_clause";
 
 	my $qlid = $self->_querylog_start("SELECT", "moderatorlog, users, comments");
 	my $sth = $self->sqlSelectMany(
@@ -1276,19 +1276,18 @@ sub dispModBombs {
 		"$where_clause",
 		"ORDER BY $order_col"
 	);
-	my(@mods, $mod, @ml_ids);
+	my(@mods, $mod);
 	# XXX can simplify this now, don't need to do fetchrow_hashref, can use utility method
 	while ($mod = $sth->fetchrow_hashref) {
 		vislenify($mod);
-		$mod->{reason_name} = $reasons->{$mod->reason}{name};
-	  $mod->{nickname2} = $self->getUser($mod->{uid2},'nickname');
+		$mod->{reason_name} = $reasons->{$mod->{reason}}{name};
+		$mod->{nickname2} = $self->getUser($mod->{uid2},'nickname');
 		push @mods, $mod;
 	}
 	$self->_querylog_finish($qlid);
 
 	my $data = {
-		mods            => $mods,
-		reasons         => $reasons,
+		mods            => \@mods,
 		mod_floor       => $mod_floor,
 		time_span       => $time_span,
 	};