matct targetlist over multiple lines

diff --git a/raid.js b/raid.js
index c7b2c5b20ad60803960ebe60d2a12111a1b3a49f..99204f4e62126ead6fba0cbdf9ba7f4620154467 100644 (file)
--- a/raid.js
+++ b/raid.js
@@ -40,7 +40,7 @@ function claim(dataSource, target, wave,cmd){
                                var obj = document.getElementById("targets");
                                if (obj){
                                        clearObject(obj);
-                                       var re = new RegExp("targetlist>(.*)</targetlist", "m");
+                                       var re = new RegExp("targetlist>((.|\\n)*)</targetlist");
                                        if(re.test(HTTP.responseText))
                                                obj.innerHTML = RegExp.$1;
                                }

diff --git a/raids.pl b/raids.pl
index 2b01ec5b611f23e4008444ccaed1f46d913924f3..4480d6bff2a13ba74a3797b3532ba4d0b3b6f268 100644 (file)
--- a/raids.pl
+++ b/raids.pl
@@ -33,7 +33,6 @@ sub generateClaimXml {
        if ($target){
                $target = "r.id = $target";
                $_ = listTargets();
-               chop;
                $BODY->param(TargetList => $_);
        }else{
                $target = "r.raid = $raid->{id}";
@@ -158,7 +157,6 @@ if ($XML && $raid && param('cmd') eq 'update' ){
 }
 if ($XML && param('cmd') eq 'gettargets' ){
        $_ = listTargets();
-       chop;
        $BODY->param(TargetList => $_);
 }
 

diff --git a/templates/targetlist.tmpl b/templates/targetlist.tmpl
index 032cc0c6036d360350df114ea9ab2322cb1facc2..0fd2a737ac925a02a6a653ee2b7c92a54ccc5660 100644 (file)
--- a/templates/targetlist.tmpl
+++ b/templates/targetlist.tmpl
@@ -1 +1,18 @@
-<TMPL_IF Targets><table><tr><th>Target</th><th>Tick</th></tr><TMPL_LOOP Targets><tr><td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a><TMPL_IF Launched>*</TMPL_IF></td><td><a href="raids.php?raid=<TMPL_VAR NAME=Raid>#target<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Tick></a></td><td><TMPL_UNLESS AJAX><a href="index.pl?page=raids&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=Unclaim&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>" >U</a><TMPL_ELSE><input type="button" value="U" onclick = "claim('index.pl?page=raids&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Unclaim')"/></TMPL_UNLESS></td></tr></TMPL_LOOP></table></TMPL_IF>
+<TMPL_IF Targets>
+<table>
+       <tr><th>Target</th><th>Tick</th></tr>
+       <TMPL_LOOP Targets>
+       <tr>
+               <td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a>
+                       <TMPL_IF Launched>*</TMPL_IF></td>
+               <td><a href="raids.php?raid=<TMPL_VAR NAME=Raid>#target<TMPL_VAR NAME=Target>">
+                       <TMPL_VAR NAME=Tick></a></td>
+               <td><TMPL_UNLESS AJAX><a href="index.pl?page=raids&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=Unclaim&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>" >U</a>
+                       <TMPL_ELSE><input type="button" value="U" onclick = 
+                               "claim('index.pl?page=raids&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Unclaim')"/>
+                       </TMPL_UNLESS>
+               </td>
+       </tr>
+       </TMPL_LOOP>
+</table>
+</TMPL_IF>