From c6a6e6dbab0ca435e6aeeb94e7c7329585b7b4f1 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Mon, 5 Feb 2007 20:38:20 +0000 Subject: [PATCH] oops --- ND/Web/Pages/Alliances.pm | 6 +++--- ND/Web/Pages/Forum.pm | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ND/Web/Pages/Alliances.pm b/ND/Web/Pages/Alliances.pm index f9b830f..69d7c92 100644 --- a/ND/Web/Pages/Alliances.pm +++ b/ND/Web/Pages/Alliances.pm @@ -103,12 +103,12 @@ sub render_body { } $BODY->param(Members => \@members); - my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin, t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',qq{not ingal AND (t.alliance_id = ? OR t.alliance_id = ?) + my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin, t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',q{not ingal AND (o.alliance_id = $1 OR t.alliance_id = $1) AND (i.mission = 'Defend' OR i.mission = 'AllyDef') - AND (t.alliance_id != ? OR t.alliance_id IS NULL OR o.alliance_id != ? OR o.alliance_id IS NULL) + AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL))) AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL) })); - $query->execute($alliance->{id},$alliance->{id},$alliance->{id},$alliance->{id}) or $error .= $DBH->errstr; + $query->execute($alliance->{id}) or $error .= $DBH->errstr; my @intel; $i = 0; diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm index 06b3dfd..b18bc35 100644 --- a/ND/Web/Pages/Forum.pm +++ b/ND/Web/Pages/Forum.pm @@ -225,6 +225,7 @@ sub render_body { ,undef,$board->{fcid}) or $ND::ERROR .= p($DBH->errstr); $BODY->param(Category => $category); + }elsif($self->{URI} =~ m{^/.*/search/(.*)}){ #List threads in this board }else{ #List boards $BODY->param(Overview => 1); $categories->execute or $ND::ERROR .= p($DBH->errstr); -- 2.39.2