X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FAlliances.pm;h=311adb3c7b726d41d452a7fdfd67dc4d21ce9154;hb=ac65e241f748773959b94d66691ee93019fcae84;hp=48975c1ce95689eaa0889d084c9c2239b19880a4;hpb=fa764f081167c8c2a5a8324aace495898ec81bbc;p=ndwebbie.git

diff --git a/ND/Web/Pages/Alliances.pm b/ND/Web/Pages/Alliances.pm
index 48975c1..311adb3 100644
--- a/ND/Web/Pages/Alliances.pm
+++ b/ND/Web/Pages/Alliances.pm
@@ -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 = ? WHERE id =?}
+			if ($DBH->do(q{UPDATE alliances SET relationship = NULLIF(?,'') WHERE id =?}
 					,undef,$value,$alliance->{id})){
 				$alliance->{relationship} = $value;
 				log_message $ND::UID,"HC set alliance: $alliance->{id} relationship: $value";
@@ -60,11 +60,11 @@ sub render_body {
 			UPDATE planets SET alliance_id = $2, nick = coalesce($3,nick)
 			WHERE id = $1;
 			});
-		while ($coords =~ m/(\d+):(\d+):(\d+)(?:\s+nick=\s*(\S+))?/g){
+		while ($coords =~ m/(\d+):(\d+):(\d+)(?:\s+nick=(\S+))?/g){
 			my ($id) = $DBH->selectrow_array($findplanet,undef,$1,$2,$3) or $ND::ERROR .= p $DBH->errstr;
 			if ($addplanet->execute($id,$alliance->{id},$4)){
 				my $nick = '';
-				$nick = '(nick $4)' if defined $4;
+				$nick = "(nick $4)" if defined $4;
 				$error .= "<p> Added planet $1:$2:$3 $nick to this alliance</p>";
 				intel_log $ND::UID,$id,"HC Added planet $1:$2:$3 $nick to alliance: $alliance->{id} ($alliance->{name})";
 			}else{
@@ -78,7 +78,7 @@ sub render_body {
 		$BODY->param(Alliance => $alliance->{name});
 		$BODY->param(Id => $alliance->{id});
 		my @relationships;
-		for my $relationship ("&nbsp;","Friendly", "NAP", "Hostile"){
+		for my $relationship ("","Friendly", "NAP", "Hostile"){
 			push @relationships,{Rel => $relationship, Selected => defined $alliance->{relationship} && $relationship eq $alliance->{relationship}}
 		}
 		$BODY->param(Relationships => \@relationships);