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

[NIEL Gérald]

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

Modified Files:
	thread.inc.php 
Log Message:

pourquoi faire simple ?...

Index: thread.inc.php
===================================================================
RCS file: /cvsroot/grisbi/grisbi-web/newsportal/lib/thread.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thread.inc.php	25 May 2010 20:58:23 -0000	1.4
+++ thread.inc.php	25 May 2010 21:10:08 -0000	1.5
@@ -26,9 +26,10 @@
  * Shows the little menu on the thread.php where you can select the
  * different pages with the articles on it
  */
-function thread_pageselect($group,$article_count,$first,$lang) {
+function thread_pageselect($group,$article_count,$first) {
   global $articles_per_page,$file_thread,$file_framethread,$name;
   global $text_thread,$thread_show;
+  global $lang;
   $pages=ceil($article_count / $articles_per_page);
   if ($article_count > $articles_per_page)
     echo $text_thread["pages"];
@@ -617,8 +618,9 @@
 /*
  * format the subject inside the thread
  */
-function thread_format_subject($c,$group,$highlightids=false,$lang) {
+function thread_format_subject($c,$group,$highlightids=false) {
   global $file_article, $thread_maxSubject, $frame_article;
+  global $lang;
   if ($c->isReply) {
     $re="Re: ";
   } else {
@@ -728,6 +730,7 @@
   global $file_article,$thread_maxSubject;
   global $age_count,$age_time,$age_color;
   global $frame_article;
+  global $lang
   $output="";
   if ($thread_treestyle==3) $output.= "\n<UL>\n";
   for ($i = 0 ; $i<count($liste) ; $i++) {
@@ -761,7 +764,7 @@
           if ($thread_show["date"])
             $output.= thread_format_date($c).' ';
           if ($thread_show["subject"])
-            $output.= thread_format_subject($c,$group,$highlight,$lang).' ';
+            $output.= thread_format_subject($c,$group,$highlight).' ';
           if ($thread_show["author"])
             $output.= "<i>(".thread_format_author($c).")</i>";
           $output.= '</span></nobr></li>';
@@ -775,7 +778,7 @@
           if ($thread_show["subject"]) {
             $output.= '<td nowrap="nowrap">'.
                  '<span class="np_thread_line_text">'.
-                 thread_format_subject($c,$group,$highlight,$lang).
+                 thread_format_subject($c,$group,$highlight).
                  '</span></td>';
           }
           if ($thread_show["author"]) {
@@ -791,7 +794,7 @@
           if ($thread_show["date"])
             $output.= thread_format_date($c)." ";
           if ($thread_show["subject"])
-            $output.= thread_format_subject($c,$group,$highlight,$lang)." ";
+            $output.= thread_format_subject($c,$group,$highlight)." ";
           if ($thread_show["author"])
             $output.= "<i>(".thread_format_author($c).")</i>";
           $output.= "</span></nobr>";
@@ -802,7 +805,7 @@
             $output.= thread_format_date($c)." ";
           $output.= formatTreeText($newtree)." ";
           if ($thread_show["subject"])
-            $output.= thread_format_subject($c,$group,$highlight,$lang)." ";
+            $output.= thread_format_subject($c,$group,$highlight)." ";
           if ($thread_show["author"])
             $output.= "<i>(".thread_format_author($c).")</i>";
           $output.= '</span></tt></nobr><br>';
@@ -818,7 +821,7 @@
           if ($thread_show["subject"])
             $output.= '<td nowrap="nowrap">'.
                       '<span class="np_thread_line_text">&nbsp;'.
-                      thread_format_subject($c,$group,$highlight,$lang)." ";
+                      thread_format_subject($c,$group,$highlight)." ";
           if ($thread_show["author"])
             $output.= '('.thread_format_author($c).')</span></td>';
           $output.= "</tr></table>";
@@ -833,7 +836,7 @@
                     '<span class="np_thread_line_text">'.
                     formatTreeText($newtree)." ";
           if ($thread_show["subject"]) {
-            $output.= thread_format_subject($c,$group,$highlight,$lang)."</span></tt></td>";
+            $output.= thread_format_subject($c,$group,$highlight)."</span></tt></td>";
             $output.= "<td></td>";
           }
           if ($thread_show["author"])
@@ -854,7 +857,7 @@
             $output.= thread_show_treegraphic($newtree);
             if ($thread_show["subject"])
               $output.= '<span class="np_thread_line_text">&nbsp;'.
-                thread_format_subject($c,$group,$highlight,$lang).'</span>';
+                thread_format_subject($c,$group,$highlight).'</span>';
             $output.='</td>';
             if($thread_show["threadsize"])
               $output.= "<td>".$c->threadsize.'</td>';
@@ -878,7 +881,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,$lang);
+                   $article_first,$article_last,$article_count,$highlight);
       }
     }
     flush();
@@ -938,8 +941,9 @@
  * $article_first: Number of the first article to be displayed
  * $article_last: last article
  */
-function thread_show(&$headers,$group,$article_first=0,$article_last=0,$lang) {
+function thread_show(&$headers,$group,$article_first=0,$article_last=0) {
   global $spooldir,$text_thread;
+  global $lang;
   $article_count=0;
   if ($headers == false) {
     echo $text_thread["no_articles"];