show forum thread on intel

diff --git a/ND/Forum.pm b/ND/Forum.pm
index 54f2b6f11909805561773f990ad46c17514206ca..78ee5a0a0e7f306fb5fb36e5f5ef8501c2ef62f3 100644 (file)
--- a/ND/Forum.pm
+++ b/ND/Forum.pm
@@ -39,7 +39,7 @@ sub viewForumThread {
        $template->param(Post => $thread->{post});
 
        my $posts = $ND::DBH->prepare(q{SELECT u.username,date_trunc('minute',fp.time::timestamp) AS time,fp.message,COALESCE(fp.time > ftv.time,TRUE) AS unread
-FROM forum_threads ft JOIN forum_posts fp USING (ftid) NATURAL JOIN users u LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
+FROM forum_threads ft JOIN forum_posts fp USING (ftid) JOIN users u USING (uid) LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
 WHERE ft.ftid = $1
 ORDER BY fp.time ASC
 });

diff --git a/intel.pl b/intel.pl
index 47ef0279a78da81f8e62e6844a1ecd95e15b5399..ba63838ebc0588993f5a0bf1acb387ffcdcd332f 100644 (file)
--- a/intel.pl
+++ b/intel.pl
@@ -19,9 +19,12 @@
 
 use strict;
 use warnings FATAL => 'all';
+use ND::Forum;
+
 our $BODY;
 our $DBH;
 our $LOG;
+our $ERROR;
 my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Intel');
@@ -44,6 +47,12 @@ if (defined param('show')){
        }
 }
 
+my $thread;
+if (defined $planet){
+       $thread = $DBH->selectrow_hashref(q{SELECT ftid AS id, subject FROM forum_threads
+               where planet = $1},undef,$planet->{id}) or $ERROR .= p($DBH->errstr);
+}
+
 if (defined param('cmd') && param('cmd') eq 'coords'){
        my $coords = param('coords');
        $DBH->do(q{CREATE TEMPORARY TABLE coordlist (
@@ -66,6 +75,9 @@ ORDER BY alliance, p.x, p.y, p.z});
        }
        $BODY->param(CoordList => \@planets);
 }
+if (defined $thread and defined param('cmd') and param('cmd') eq 'forumpost'){
+       addForumPost($DBH,$thread,$ND::UID,param('message'));
+}
 
 if ($planet && defined param('cmd')){
        if (param('cmd') eq 'change'){
@@ -134,6 +146,8 @@ if ($planet){
        my @alliances = alliances($planet->{alliance_id});
        $BODY->param(Alliances => \@alliances);
 
+       $BODY->param(Thread => viewForumThread $thread);
+
        my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin',"t.id = ? $showticks"));
        $query->execute($planet->{id}) or $error .= $DBH->errstr;
        my @intellists;
@@ -202,6 +216,6 @@ while (my $message = $query->fetchrow_hashref){
        $message->{message} = parseMarkup($message->{message});
        push @messages,$message;
 }
-$BODY->param(IntelMessages => \@messages);
+#$BODY->param(IntelMessages => \@messages);
 $BODY->param(Error => $error);
 1;

diff --git a/templates/intel.tmpl b/templates/intel.tmpl
index 288b1e146df4c3d1dca857616dc9a539d88521fa..81f527cc0fa42130a540e8c8a440d1949359e6fb 100644 (file)
--- a/templates/intel.tmpl
+++ b/templates/intel.tmpl
@@ -1,4 +1,5 @@
 <TMPL_VAR NAME=Error>
+<div class='leftinfo'>
 <form action="<TMPL_VAR NAME=PAGE>" method="post"><p>
        <input type="text" name="coords" value="<TMPL_VAR NAME=Coords>"/>
        <input type="submit" value="Check"/>
@@ -74,6 +75,22 @@
 </TMPL_LOOP>
 </table>
 </TMPL_IF>
+</div>
+
+<TMPL_IF Thread>
+<div>
+<TMPL_VAR 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="coords" value="<TMPL_VAR NAME=Coords>"/>
+       <br/>
+       <input type="submit" value="Submit"/>
+</fieldset></form>
+</div>
+</TMPL_IF>
 
 <TMPL_LOOP IntelLists>
 <TMPL_IF Message><p><TMPL_VAR NAME=Message></p></TMPL_IF>