Index: index.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -r1.1 -r1.2
68,70c68
< <tr>
<     <td width="100%" colspan=2 <?PHP echo bgcolor($table_header_color); ?>><FONT color="<?PHP echo $table_header_font_color; ?>">&nbsp;<?PHP echo $lAvailableForums;?></font></td>
< </tr>
---
> <? diary_BannerSectionColSpan($lAvailableForums, 2) ?>
154c152
< ?>
\ No newline at end of file
---
> ?>
Index: list.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/list.php,v
retrieving revision 1.1
retrieving revision 1.8
diff -r1.1 -r1.8
21a22,25
>   if ($article_id) {
>      AddGetVar("article_id", $article_id);
>   }
> 
108c112,122
<       $sSQL = "Select thread from $ForumTableName where thread > $cutoff_thread and approved='Y' order by thread desc".$limit;
---
>       if ($article_id) {
>          $sSQL = "Select thread 
>                     from $ForumTableName, $ForumTableName"."_xref 
>                    where $ForumTableName"."_xref.article_id = $article_id
>                      and $ForumTableName"."_xref.thread_id  = $ForumTableName.thread
>                      and thread > 0 
>                      and approved='Y' 
>                    order by thread desc".$limit;
>       } else {
>          $sSQL = "Select thread from $ForumTableName where thread > $cutoff_thread and approved='Y' order by thread desc".$limit;
>       }
111c125,136
<       $sSQL = "Select thread, count(id) as tcount, max(datestamp) as latest, max(id) as maxid from $ForumTableName where approved='Y' AND thread > $cutoff_thread group by thread order by thread desc".$limit;
---
>       if ($article_id) {
>          $sSQL = "Select thread, count(id) as tcount, max(datestamp) as latest, max(id) as maxid 
>                    from $ForumTableName, $ForumTableName"."_xref
>                   where $ForumTableName"."_xref.article_id = $article_id
>                     and $ForumTableName"."_xref.thread_id  = $ForumTableName.thread
>                     and approved  ='Y'
>                    AND thread    > $cutoff_thread 
>                   group by thread 
>                   order by thread desc".$limit;
>       } else {
>          $sSQL = "Select thread, count(id) as tcount, max(datestamp) as latest, max(id) as maxid from $ForumTableName where approved='Y' AND thread > $cutoff_thread group by thread order by thread desc".$limit;
>       }
117c142,153
<       $sSQL = "Select thread from $ForumTableName where approved='Y' AND thread < $cutoff_thread AND thread > $thread order by thread".$limit;
---
>       if ($article_id) {
>          $sSQL = "Select thread
>                     from $ForumTableName, $ForumTableName"."_xref
>                    where $ForumTableName"."_xref.article_id = $article_id
>                      and $ForumTableName"."_xref.thread_id  = $ForumTableName.thread
>                      and thread > $thread
>                      and thread < $cutoff_thread
>                      and approved='Y'
>                    order by thread desc".$limit;
>       } else {
>          $sSQL = "Select thread from $ForumTableName where approved='Y' AND thread < $cutoff_thread AND thread > $thread order by thread".$limit;
>       }
136,140c172,198
<     if($$phcollapse==0){
<       $sSQL = "Select thread from $ForumTableName where approved='Y' and thread < $thread and thread > $cutoff_thread order by thread desc".$limit;
<     }
<     else{
<       $sSQL = "Select thread, COUNT(id) AS tcount, MAX(datestamp) AS latest, MAX(id) AS maxid FROM $ForumTableName WHERE approved='Y' AND thread < $thread AND thread > $cutoff_thread GROUP BY thread ORDER BY thread DESC".$limit;
---
>     if ($$phcollapse==0) {
>        if ($article_id) {
>           $sSQL = "Select thread
>                      from $ForumTableName, $ForumTableName"."_xref
>                     where $ForumTableName"."_xref.article_id = $article_id
>                       and $ForumTableName"."_xref.thread_id  = $ForumTableName.thread
>                       and thread   < $thread
>                       and thread   > $cutoff_thread
>                       and approved ='Y'
>                     order by thread desc".$limit;
>        } else {
>           $sSQL = "Select thread from $ForumTableName where approved='Y' and thread < $thread and thread > $cutoff_thread order by thread desc".$limit;
>        }
>     } else {
>        if ($article_id) {
>        $sSQL = "Select thread, count(id) as tcount, max(datestamp) as latest, max(id) as maxid
>                  from $ForumTableName, $ForumTableName"."_xref
>                 where $ForumTableName"."_xref.article_id = $article_id
>                   and $ForumTableName"."_xref.thread_id  = $ForumTableName.thread
>                   and approved  = 'Y'
>                   and thread   < $thread
>                   and thread   > $cutoff_thread
>                 group by thread
>                 order by thread desc".$limit;
>        } else {
>           $sSQL = "Select thread, COUNT(id) AS tcount, MAX(datestamp) AS latest, MAX(id) AS maxid FROM $ForumTableName WHERE approved='Y' AND thread < $thread AND thread > $cutoff_thread GROUP BY thread ORDER BY thread DESC".$limit;
>        }
176,177c234,246
<   if($$phcollapse==0){
<     $sSQL = "Select id,parent,thread,subject,author,datestamp from $ForumTableName where approved='Y' AND thread<=$max and thread>=$min order by thread desc, id asc";
---
>   if ($$phcollapse==0) {
>      if ($article_id) {
>         $sSQL = "Select id, parent, thread, subject, author, datestamp
>                    from $ForumTableName, $ForumTableName"."_xref
>                    where $ForumTableName"."_xref.article_id = $article_id
>                     and $ForumTableName"."_xref.thread_id  = $ForumTableName.thread
>                     and approved  = 'Y'
>                     and thread   <= $max
>                     and thread   >= $min
>                   order by thread desc, id asc";
>      } else {
>         $sSQL = "Select id,parent,thread,subject,author,datestamp from $ForumTableName where approved='Y' AND thread<=$max and thread>=$min order by thread desc, id asc";
>      }
180c249,261
<     $sSQL = "Select id,thread,subject,author,datestamp from $ForumTableName where approved='Y' AND thread = id AND thread<=$max AND thread>=$min order by thread desc";
---
>      if ($article_id) {
>         $sSQL = "Select id, parent, thread, subject, author, datestamp
>                    from $ForumTableName, $ForumTableName"."_xref
>                   where $ForumTableName"."_xref.article_id = $article_id
>                     and $ForumTableName"."_xref.thread_id  = $ForumTableName.thread
>                     and approved  = 'Y'
>                     and thread    = id
>                     and thread   <= $max
>                     and thread   >= $min
>                   order by thread desc";
>         } else {
>            $sSQL = "Select id,thread,subject,author,datestamp from $ForumTableName where approved='Y' AND thread = id AND thread<=$max AND thread>=$min order by thread desc";
>         }
199a281,282
>   diary_BannerForum($ForumName, $article_id);
> 
232a316
> 
253c337
< ?>
\ No newline at end of file
---
> ?>
Index: post.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/post.php,v
retrieving revision 1.1
retrieving revision 1.6
diff -r1.1 -r1.6
24a25,28
>   if ($article_id) {
>      AddGetVar("article_id", $article_id);
>   }
> 
69a74,75
>     diary_BannerForum($ForumName, $article_id);
> 
\ No newline at end of file
---
> ?>
Index: read.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/read.php,v
retrieving revision 1.1
retrieving revision 1.3
diff -r1.1 -r1.3
23a24,28
> 
>   if ($article_id) {
>      AddGetVar("article_id", $article_id);
>   }
> 
249a255,256
> 
>   diary_BannerForum($ForumName, $article_id);
Index: search.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/search.php,v
retrieving revision 1.1
retrieving revision 1.3
diff -r1.1 -r1.3
24a25,28
>   if ($article_id) {
>      AddGetVar("article_id", $article_id);
>   }
> 
189a194,196
> 
>   diary_BannerForum($ForumName, $article_id);
> 
259a267
> <input type="Hidden" name="article_id" value="<?PHP echo $article_id; ?>">
309c317
< ?>
\ No newline at end of file
---
> ?>
Index: _includes/footer.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/_includes/footer.php,v
retrieving revision 1.1
retrieving revision 1.3
diff -r1.1 -r1.3
1,2c1,3
< </td></tr>
< </table>
---
> <center>
> <a href="../forum-tips.php">How to get the most out of the forum</a>
> </center>
Index: _includes/form.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/_includes/form.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -r1.1 -r1.2
71a72
> <input type="Hidden" name="article_id" value="<?PHP echo $article_id; ?>">
Index: _includes/header.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/_includes/header.php,v
retrieving revision 1.1
retrieving revision 1.8
diff -r1.1 -r1.8
1d0
< 
2a2,3
>    # $Id: phorum-article-feedback.diff,v 1.1 2001-07-30 13:39:56 dan Exp $
> 
3a5,7
> 
>    diary_HTML_start();
> 
5d8
< <HTML>
7,8d9
< <meta name="Phorum Version" content="<?PHP echo $phorumver; ?>">
< <meta name="Phorum DB" content="<?PHP echo $DB->type; ?>">
11,15c12,22
<   BODY {font-family: Arial, Helvetica;font-size: 10pt;}
<   TD {font-family: Arial, Helvetica;font-size: 10pt;}
< 	INPUT {font-family: Arial, Helvetica;font-size: 10pt;}
< 	TEXTAREA {font-family: Arial, Helvetica;font-size: 10pt;width: 500px;}
<   .nav {font-family: MS Sans Serif,Geneva,sans-serif;font-size: 8pt;}
---
>                 TD { font-family: times, serif; font-size: 12px; }
>                 TD.sans { font-family: arial, sans-serif; font-size: 10px; }
>                 P { font-family: times, serif; font-size: 12px; }
>                 P.white { color: white; }
>                 P.whitehead { font-family: arial, sans-serif; color: white; font-size: 14px; font-weight: 900; }
>                 P.blackhead { font-family: arial, sans-serif; color: black; font-size: 14px; font-weight: 900; }
>                 P.yellow { color: #FFCC33; }
>                 A { color: #663333; text-decoration: underline; }
>                 A:hover { color: #666666; }
>                 A.white { color: white; text-decoration: none; }
>                 A.white:hover { text-decoration: underline; }
16a24,25
> <meta name="Phorum Version" content="<?PHP echo $phorumver; ?>">
> <meta name="Phorum DB"      content="<?PHP echo $DB->type; ?>">
18d26
< <BODY>
20c28,31
<    diary_header();
---
>    diary_body();
>    diary_BurstMediaAd();
>    diary_Logo();
>    diary_navigation_bar_top();
22,31c33,34
< <center>
< <p><a href="../forum-tips.html">How to get the most out of the forum</a></p>
< <h1>WARNING</h1>
< <p>Sometime over the next few days, the website is being transferred to a new box.  Some messages may be lost as the DNS catches up with the new IP.  That is, some of you will be seeing the old website and some will see the new website.  I'll try to merge any missing messages.</p>.
< </center>
< <table width="100%">
<   <tr>
<     <td bgcolor="#AD0040"><big><big><font color="#FFFFFF"><?PHP echo $ForumName; ?></font></big></big></td>
<   </tr>
< <tr><td>
---
> 
> 
Index: _includes/post.php
===================================================================
RCS file: /home/repositories/freebsddiary/www/phorum/_includes/post.php,v
retrieving revision 1.1
retrieving revision 1.3
diff -r1.1 -r1.3
216a217
>     global $article_id;
335a337,347
>     #
>     # this is where we add an entry to the cross reference table for article by article feedback.
>     # we only need to do this if $id = $thread, because that's the first message for a thread.
>     if ($article_id && $id == $thread) {
>        $sSQL = "INSERT INTO $ForumTableName"."_xref (article_id, thread_id) values ($article_id, $thread)";
>        $q->query($DB, $sSQL);
>        if(!$q->result){
>          return($q->error()."<br>$sSQL");
>        }
>     }
> 
418c430
< ?>
\ No newline at end of file
---
> ?>

