$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";
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{
$BODY->param(Alliance => $alliance->{name});
$BODY->param(Id => $alliance->{id});
my @relationships;
- for my $relationship (" ","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);