possible to recall fleets

diff --git a/main.pl b/main.pl
index 0853243f37c24d2733a89f0f6c7118ae0d149446..20a1607289ac94cbaf1025319e0e95030f086615 100644 (file)
--- a/main.pl
+++ b/main.pl
@@ -57,6 +57,35 @@ UPDATE users SET planet =
 WHERE uid = ? });
        $query->execute($1,$2,$3,$ND::UID);
 }
+if (param('cmd') eq 'Recall Fleets'){
+       $DBH->begin_work;
+       my $updatefleets = $DBH->prepare('UPDATE fleets SET back = tick() + (tick() - (landing_tick - eta))  WHERE uid = ? AND id = ?');
+       
+       for my $param (param()){
+               if ($param =~ /^change:(\d+)$/){
+                       if($updatefleets->execute($ND::UID,$1)){
+                               $ND::LOG->execute($ND::UID,"Member recalled fleet $1");
+                       }else{
+                               $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+                       }
+               }
+       }
+       $DBH->commit or $error .= '<p>'.$DBH->errstr.'</p>';
+}
+if (param('cmd') eq 'Change Fleets'){
+       $DBH->begin_work;
+       my $updatefleets = $DBH->prepare('UPDATE fleets SET back = ? WHERE uid = ? AND id = ?');
+       for my $param (param()){
+               if ($param =~ /^change:(\d+)$/){
+                       if($updatefleets->execute(param("back:$1"),$ND::UID,$1)){
+                               $ND::LOG->execute($ND::UID,"Member set fleet $1 to be back tick: ".param("back:$1"));
+                       }else{
+                               $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+                       }
+               }
+       }
+       $DBH->commit or $error .= '<p>'.$DBH->errstr.'</p>';
+}
 if(param('oldpass') && param('pass')){
        my $query = $DBH->prepare('UPDATE users SET password = MD5(?) WHERE password = MD5(?) AND uid = ?');
        $query->execute(param('pass'),param('oldpass'),$ND::UID);
@@ -99,19 +128,22 @@ if ($planet){
 }
 
 
-my $query = $DBH->prepare(q{SELECT f.fleet, coords(x,y,z), mission, sum(fs.amount) AS amount, landing_tick 
+my $query = $DBH->prepare(q{SELECT f.fleet,f.id, coords(x,y,z) AS target, mission, sum(fs.amount) AS amount, landing_tick, back
 FROM fleets f 
        JOIN fleet_ships fs ON f.id = fs.fleet 
        JOIN current_planet_stats p ON f.target = p.id
-WHERE f.uid = ? AND (f.fleet = 0 OR landing_tick > ?)
-GROUP BY f.fleet, x,y,z, mission, landing_tick
+WHERE f.uid = ? AND (f.fleet = 0 OR back >= ?)
+GROUP BY f.fleet,f.id, x,y,z, mission, landing_tick,back
 ORDER BY f.fleet
 });
 
-$query->execute($ND::UID,$ND::TICK);
+$query->execute($ND::UID,$ND::TICK) or $error .= '<p>'.$DBH->errstr.'</p>';
 my @fleets;
-while (my($fleet,$coords,$mission,$amount,$landing_tick) = $query->fetchrow){
-       push @fleets,{Target => $coords, Mission => $mission, Amount => $amount, LandingTick => $landing_tick};
+my $i = 0;
+while (my $fleet = $query->fetchrow_hashref){
+       $i++;
+       $fleet->{ODD} = $i % 2;
+       push @fleets,$fleet;
 }
 $BODY->param(Fleets => \@fleets);
 

diff --git a/templates/main.tmpl b/templates/main.tmpl
index e1570e732570e8836eb2dd190d82b7b6a1bb563e..4df7437350226dafca2433585fd7494f1cfca50f 100644 (file)
--- a/templates/main.tmpl
+++ b/templates/main.tmpl
@@ -33,15 +33,24 @@
        </ul>
 </fieldset>
 <fieldset> <legend>Fleets</legend>
+<form action="/index.pl" method="post">
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        <table>
-       <tr><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th><th>Back home</th></tr>
+       <tr><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th><th>Back home</th><th>change?</th></tr>
        <TMPL_LOOP Fleets>
-       <tr><td><TMPL_VAR NAME=Target></td><td><TMPL_VAR NAME=Mission></td>
-               <td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=LandingTick></td>
-               <td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=Back></td>
+       <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+               <td><TMPL_VAR NAME=Target></td><td><TMPL_VAR NAME=Mission></td>
+               <td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=Landing_Tick></td>
+               <td><TMPL_IF Fleet><input class="coordsinput" type="text" name="back:<TMPL_VAR NAME=Id>" value="<TMPL_VAR NAME=Back>"/></TMPL_IF></td>
+               <td><TMPL_IF Fleet><input type="checkbox" name="change:<TMPL_VAR NAME=Id>"/></TMPL_IF></td>
        </tr>
        </TMPL_LOOP>
        </table>
+       <p>
+               <input type="submit" name="cmd" value="Change Fleets"/>
+               <input type="submit" name="cmd" value="Recall Fleets"/>
+       </p>
+</form>
 </fieldset>
 <form action="/index.pl?page=main" method="post">
 <fieldset> <legend>SMS</legend>