X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FAlliances.pm;h=9a4ec6196b3553734f8d6f039489fc2074d6f482;hb=eb2ec45ab96b0968c5bfc5d17ec6c6d7a57ebe37;hp=311adb3c7b726d41d452a7fdfd67dc4d21ce9154;hpb=d6c9085e748c4d61901aaea72f0e1546dcc7cdda;p=ndwebbie.git

diff --git a/NDWeb/Pages/Alliances.pm b/NDWeb/Pages/Alliances.pm
index 311adb3..9a4ec61 100644
--- a/NDWeb/Pages/Alliances.pm
+++ b/NDWeb/Pages/Alliances.pm
@@ -17,16 +17,16 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::Pages::Alliances;
+package NDWeb::Pages::Alliances;
 use strict;
 use warnings FATAL => 'all';
 use ND::Include;
 use CGI qw/:standard/;
-use ND::Web::Include;
+use NDWeb::Include;
 
-use base qw/ND::Web::XMLPage/;
+use base qw/NDWeb::XMLPage/;
 
-$ND::Web::Page::PAGES{alliances} = __PACKAGE__;
+$NDWeb::Page::PAGES{alliances} = __PACKAGE__;
 
 sub render_body {
 	my $self = shift;
@@ -46,7 +46,7 @@ sub render_body {
 		$DBH->begin_work;
 		if (param('crelationship')){
 			my $value = escapeHTML(param('relationship'));
-			if ($DBH->do(q{UPDATE alliances SET relationship = NULLIF(?,'') WHERE id =?}
+			if ($DBH->do(q{UPDATE alliances SET relationship = ? WHERE id =?}
 					,undef,$value,$alliance->{id})){
 				$alliance->{relationship} = $value;
 				log_message $ND::UID,"HC set alliance: $alliance->{id} relationship: $value";
@@ -95,10 +95,7 @@ sub render_body {
 			ORDER BY $order});
 		my @members;
 		$members->execute($alliance->{id});
-		my $i = 0;
 		while (my $member = $members->fetchrow_hashref){
-			$i++;
-			$member->{ODD} = $i % 2;
 			push @members,$member;
 		}
 		$BODY->param(Members => \@members);
@@ -111,15 +108,12 @@ sub render_body {
 		$query->execute($alliance->{id}) or $error .= $DBH->errstr;
 
 		my @intel;
-		$i = 0;
 		while (my $intel = $query->fetchrow_hashref){
 			if ($intel->{ingal}){
 				$intel->{missionclass} = 'ingal';
 			}else{
 				$intel->{missionclass} = $intel->{mission};
 			}
-			$i++;
-			$intel->{ODD} = $i % 2;
 			push @intel,$intel;
 		}
 		$BODY->param(Intel => \@intel);
@@ -142,11 +136,8 @@ sub render_body {
 			})or $error .= $DBH->errstr;
 		$query->execute or $error .= $DBH->errstr;
 		my @alliances;
-		my $i = 0;
 		while (my $alliance = $query->fetchrow_hashref){
 			next unless (defined $alliance->{score} || $alliance->{kscore} > 0);
-			$i++;
-			$alliance->{ODD} = $i % 2;
 			push @alliances, $alliance;
 		}
 		$BODY->param(Alliances => \@alliances);