Merge branch 'master' of ruin.nu:git/ndwebbie

diff --git a/ND b/ND
index 191d620ec3cca636c73143c9ca3840b5bc5a6f40..193d9ed10fea0563da8da5f54ec42f3068547dd4 160000 (submodule)
--- a/ND
+++ b/ND
@@ -1 +1 @@
-Subproject commit 191d620ec3cca636c73143c9ca3840b5bc5a6f40
+Subproject commit 193d9ed10fea0563da8da5f54ec42f3068547dd4

diff --git a/NDWeb/Pages/Calls.pm b/NDWeb/Pages/Calls.pm
index 8303b4f42718bb722211e3b364af3ad41d81881e..91e59dfc81e76508880f11dd5788bf19184374de 100644 (file)
--- a/NDWeb/Pages/Calls.pm
+++ b/NDWeb/Pages/Calls.pm
@@ -19,6 +19,7 @@
 package NDWeb::Pages::Calls;
 use strict;
 use warnings;
+use NDWeb::Forum;
 use ND::Include;
 use CGI qw/:standard/;
 use NDWeb::Include;
@@ -36,15 +37,19 @@ sub render_body {
        return $self->noAccess unless $self->isDC;
 
        my $call;
+       my $thread;
        if (defined param('call') && param('call') =~ /^(\d+)$/){
                my $query = $DBH->prepare(q{
-                       SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered, open, dc.username AS dc, u.defense_points,c.member,u.planet, u.username AS member, u.sms
+                       SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered, open, dc.username AS dc, u.defense_points,c.member,u.planet, u.username AS member, u.sms,c.ftid
                        FROM calls c 
                        JOIN users u ON c.member = u.uid
                        LEFT OUTER JOIN users dc ON c.dc = dc.uid
                        JOIN current_planet_stats p ON u.planet = p.id
                        WHERE c.id = ?});
                $call = $DBH->selectrow_hashref($query,undef,$1);
+
+               $thread = $DBH->selectrow_hashref(q{SELECT ftid AS id, subject FROM forum_threads
+                       where ftid = $1},undef,$call->{ftid}) or warn $DBH->errstr;
        }
        if ($call && defined param('cmd')){
                if (param('cmd') eq 'Submit'){
@@ -53,7 +58,7 @@ sub render_body {
                                if ($DBH->do(q{UPDATE calls SET landing_tick = ? WHERE id = ?}
                                                ,undef,param('tick'),$call->{id})){
                                        $call->{landing_tick} = param('tick');
-                                       log_message $ND::UID,"DC updated landing tick for call $call->{id}";
+                                       def_log $ND::UID,$call->{id},"Updated landing tick to [B] $call->{landing_tick} [/B]";
                                }else{
                                        warn $DBH->errstr;
                                }
@@ -62,7 +67,7 @@ sub render_body {
                                if ($DBH->do(q{UPDATE calls SET info = ? WHERE id = ?}
                                                ,undef,param('info'),$call->{id})){
                                        $call->{info} = param('info');
-                                       log_message $ND::UID,"DC updated info for call $call->{id}";
+                                       def_log $ND::UID,$call->{id},"Updated info";
                                }else{
                                        warn $DBH->errstr;
                                }
@@ -84,6 +89,7 @@ sub render_body {
                                $call->{covered} = (param('cmd') eq 'Cover call');
                                $call->{open} = (param('cmd') =~ /^(Uncover|Open) call$/);
                                $call->{DC} = $self->{USER};
+                               def_log $ND::UID,$call->{id},'Changed status to: [B]'.param('cmd').'[/B]';
                        }else{
                                warn $DBH->errstr;
                        }
@@ -93,7 +99,7 @@ sub render_body {
                        for my $param (param()){
                                if ($param =~ /^change:(\d+)$/){
                                        if($query->execute($1,$call->{id})){
-                                               log_message $ND::UID,"DC deleted fleet: $1, call $call->{id}";
+                                               def_log $ND::UID,$call->{id},"Deleted fleet: [B] $1 [/B]";
                                        }else{
                                                warn $DBH->errstr;
                                        }
@@ -107,7 +113,7 @@ sub render_body {
                                if ($param =~ /^change:(\d+)$/){
                                        my $shiptype = escapeHTML(param("shiptype:$1"));
                                        if($query->execute($shiptype,$1,$call->{id})){
-                                               log_message $ND::UID,"DC set fleet: $1, call $call->{id} to: $shiptype";
+                                               def_log $ND::UID,$call->{id},"set fleet: [B] $1 [/B] to: [B] $shiptype [/B]";
                                        }else{
                                                warn $DBH->errstr;
                                        }
@@ -115,6 +121,9 @@ sub render_body {
                        }
                        $DBH->commit or warn $DBH->errstr;
                }
+               if (defined $thread and param('cmd') eq 'forumpost'){
+                       addForumPost($DBH,$thread,$ND::UID,param('message'));
+               }
        }
 
        if ($call){
@@ -127,6 +136,7 @@ sub render_body {
                $BODY->param(DC => $call->{dc});
                $BODY->param(Member => $call->{member});
                $BODY->param(SMS => $call->{sms});
+               $BODY->param(Thread => viewForumThread $thread);
                if ($call->{covered}){
                        $BODY->param(Cover => 'Uncover');
                }else{

diff --git a/templates/calls.tmpl b/templates/calls.tmpl
index 70a26133501256c37057367bdb07d12e42fe64db..4a542cc5772cea25f3a46bcd4a89e1412743d1a5 100644 (file)
--- a/templates/calls.tmpl
+++ b/templates/calls.tmpl
@@ -142,6 +142,21 @@
        </TMPL_LOOP>
 </table>
 </fieldset>
+
+<TMPL_IF Thread>
+<div>
+<TMPL_VAR ESCAPE=NONE NAME=Thread>
+<form action="<TMPL_VAR NAME=PAGE>#NewPosts" method="post"><fieldset class="forum-post"> <legend>New Reply</legend>
+       <textarea rows="10" cols="60" name="message"></textarea>
+       <input type="hidden" name="cmd" value="forumpost"/>
+       <input type="hidden" name="t" value="<TMPL_VAR NAME=Id>"/>
+       <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
+       <input type="hidden" name="call" value="<TMPL_VAR NAME=Call>"/>
+       <br/>
+       <input type="submit" value="Submit"/>
+</fieldset></form>
+</div>
+</TMPL_IF>
 <TMPL_ELSE>
 <table>
        <tr><th>Call</th><th>DC</th><th>Def Fleets</th><th>Member (def points)</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>ETA</th><th>Alliance</th><th>Attackers</th></tr>