[grisbi-cvs] grisbi-web/newsportal/lib thread.inc.php,1.3,1.4

[NIEL Gérald]

Update of /cvsroot/grisbi/grisbi-web/newsportal/lib
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20529/newsportal/lib

Modified Files:
	thread.inc.php 
Log Message:

site integration

Index: thread.inc.php
===================================================================
RCS file: /cvsroot/grisbi/grisbi-web/newsportal/lib/thread.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thread.inc.php	25 May 2010 20:38:46 -0000	1.3
+++ thread.inc.php	25 May 2010 20:58:23 -0000	1.4
@@ -617,7 +617,7 @@
 /*
  * format the subject inside the thread
  */
-function thread_format_subject($c,$group,$highlightids=false) {
+function thread_format_subject($c,$group,$highlightids=false,$lang) {
   global $file_article, $thread_maxSubject, $frame_article;
   if ($c->isReply) {
     $re="Re: ";
@@ -638,7 +638,7 @@
     if ((isset($frame_article)) && ($frame_article != ""))
       $return .= 'target="'.$frame_article.'" ';
     $return .= 'href="'.$file_article.
-       '?id='.urlencode($c->number).'&group='.urlencode($group).'#'.
+       '?id='.urlencode($c->number).'&group='.urlencode($group).'#'.
        urlencode($c->number).'&lang='.$lang.'">';
   }
   $return.=$re.htmlspecialchars(substr(trim($c->subject),0,$thread_maxSubject));
@@ -722,7 +722,7 @@
  * Displays a part of the thread. This function is recursively called
  * It is used by thread_show
  */
-function thread_show_recursive(&$headers,&$liste,$depth,$tree,$group,$article_first=0,$article_last=0,&$article_count,$highlight=false) {
+function thread_show_recursive(&$headers,&$liste,$depth,$tree,$group,$article_first=0,$article_last=0,&$article_count,$highlight=false,$lang) {
   global $thread_treestyle;
   global $thread_show,$imgdir;
   global $file_article,$thread_maxSubject;
@@ -761,7 +761,7 @@
           if ($thread_show["date"])
             $output.= thread_format_date($c).' ';
           if ($thread_show["subject"])
-            $output.= thread_format_subject($c,$group,$highlight).' ';
+            $output.= thread_format_subject($c,$group,$highlight,$lang).' ';
           if ($thread_show["author"])
             $output.= "<i>(".thread_format_author($c).")</i>";
           $output.= '</span></nobr></li>';
@@ -775,7 +775,7 @@
           if ($thread_show["subject"]) {
             $output.= '<td nowrap="nowrap">'.
                  '<span class="np_thread_line_text">'.
-                 thread_format_subject($c,$group,$highlight).
+                 thread_format_subject($c,$group,$highlight,$lang).
                  '</span></td>';
           }
           if ($thread_show["author"]) {
@@ -791,7 +791,7 @@
           if ($thread_show["date"])
             $output.= thread_format_date($c)." ";
           if ($thread_show["subject"])
-            $output.= thread_format_subject($c,$group,$highlight)." ";
+            $output.= thread_format_subject($c,$group,$highlight,$lang)." ";
           if ($thread_show["author"])
             $output.= "<i>(".thread_format_author($c).")</i>";
           $output.= "</span></nobr>";
@@ -802,7 +802,7 @@
             $output.= thread_format_date($c)." ";
           $output.= formatTreeText($newtree)." ";
           if ($thread_show["subject"])
-            $output.= thread_format_subject($c,$group,$highlight)." ";
+            $output.= thread_format_subject($c,$group,$highlight,$lang)." ";
           if ($thread_show["author"])
             $output.= "<i>(".thread_format_author($c).")</i>";
           $output.= '</span></tt></nobr><br>';
@@ -818,7 +818,7 @@
           if ($thread_show["subject"])
             $output.= '<td nowrap="nowrap">'.
                       '<span class="np_thread_line_text">&nbsp;'.
-                      thread_format_subject($c,$group,$highlight)." ";
+                      thread_format_subject($c,$group,$highlight,$lang)." ";
           if ($thread_show["author"])
             $output.= '('.thread_format_author($c).')</span></td>';
           $output.= "</tr></table>";
@@ -833,7 +833,7 @@
                     '<span class="np_thread_line_text">'.
                     formatTreeText($newtree)." ";
           if ($thread_show["subject"]) {
-            $output.= thread_format_subject($c,$group,$highlight)."</span></tt></td>";
+            $output.= thread_format_subject($c,$group,$highlight,$lang)."</span></tt></td>";
             $output.= "<td></td>";
           }
           if ($thread_show["author"])
@@ -854,7 +854,7 @@
             $output.= thread_show_treegraphic($newtree);
             if ($thread_show["subject"])
               $output.= '<span class="np_thread_line_text">&nbsp;'.
-                thread_format_subject($c,$group,$highlight).'</span>';
+                thread_format_subject($c,$group,$highlight,$lang).'</span>';
             $output.='</td>';
             if($thread_show["threadsize"])
               $output.= "<td>".$c->threadsize.'</td>';
@@ -878,7 +878,7 @@
       if (!isset($newtree)) $newtree="";
       if($thread_show["replies"]) {
         $output.=thread_show_recursive($headers,$c->answers,$depth+1,$newtree."",$group,
-                   $article_first,$article_last,$article_count,$highlight);
+                   $article_first,$article_last,$article_count,$highlight,$lang);
       }
     }
     flush();
@@ -939,7 +939,7 @@
  * $article_last: last article
  */
 function thread_show(&$headers,$group,$article_first=0,$article_last=0,$lang) {
-  global $spooldir,$text_thread,$lang;
+  global $spooldir,$text_thread;
   $article_count=0;
   if ($headers == false) {
     echo $text_thread["no_articles"];
@@ -961,7 +961,7 @@
       reset($liste);
       if (count($liste)>0) {
         $output.=thread_show_recursive($headers,$liste,1,"",$group,$article_first,
-                 $article_last,$article_count);
+                 $article_last,$article_count,$lang);
       }
       // cache the html-output
       $file=fopen($filename,"w");