X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=article.php;h=2c7faeb9074073489a80d5c2c4533d4b2f08ed3b;hb=0ca6e016df00775cb41b7eafacac369e9a41bd21;hp=e63845990e29c44cfd12d23827cf29757560a68e;hpb=40e27a1112fcbf1e6a9bd8a06ba43572300e9791;p=banana.git

diff --git a/article.php b/article.php
index e638459..2c7faeb 100644
--- a/article.php
+++ b/article.php
@@ -7,22 +7,19 @@
 * Copyright: See COPYING files that comes with this distribution
 ********************************************************************************/
 
-require("include/session.inc.php");
-require("include/encoding.inc.php");
-require("include/wrapper.inc.php");
-require("include/format.inc.php");
-require("include/config.inc.php");
-require("include/NetNNTP.inc.php");
-require("include/spool.inc.php");
-require("include/post.inc.php");
-require("include/profile.inc.php");
-require("include/password.inc.php");
-require("include/error.inc.php");
+require_once("include/session.inc.php");
+require_once("include/misc.inc.php");
+require_once("include/format.inc.php");
+require_once("include/config.inc.php");
+require_once("include/NetNNTP.inc.php");
+require_once("include/spool.inc.php");
+require_once("include/post.inc.php");
+require_once("include/profile.inc.php");
+require_once("include/password.inc.php");
+require_once("include/error.inc.php");
 
-$profile=getprofile();
-require($profile['locale']);
-
-require("include/header.inc.php");
+$profile = getprofile();
+require_once("include/header.inc.php");
 
 if (isset($_REQUEST['group'])) {
   $group=htmlentities(strtolower($_REQUEST['group']));
@@ -41,7 +38,7 @@ $spool = new spool($nntp,$group,$profile['display'],$profile['lastnews']);
 if (!$spool) error("nntpspool");
 $nntp->group($group);
 
-$post = new post($nntp,$id);
+$post = new NNTPPost($nntp,$id);
 if (!$post) {
   if ($nntp->lasterrorcode == "423") {
     $spool->delid($id);
@@ -53,22 +50,21 @@ $ndx = $spool->getndx($id);
 
 ?>
 <h1>
-  <?php echo $locale['article']['message'];?>
+  <?php echo _b_('Message'); ?>
 </h1>
 
 <?php
 if (isset($_GET['type']) && ($_GET['type']=='cancel') && (checkcancel($post->headers))) {
 ?>
 <p class="<?php echo $css['error']?>">
-  <?php echo $locale['article']['cancel'];?>
+  <?php echo _b_('Voulez-vous vraiment annuler ce message ?'); ?>
 </p>
 <form action="thread.php" method="post">
   <input type="hidden" name="group" value="<?php echo $group;?>" />
   <input type="hidden" name="id" value="<?php 
     echo $id;?>" />
   <input type="hidden" name="type" value="cancel" />
-  <input type="submit" name="action" value="<?php echo 
-    $locale['article']['okbtn'];?>" />
+  <input type="submit" name="action" value="<?php echo _b_('OK'); ?>" />
 </form>
 <?
 }
@@ -77,23 +73,23 @@ displayshortcuts();
 ?>
 
 <table class="<?php echo $css['bicol']?>" cellpadding="0" cellspacing="0" 
-summary="<?php echo $locale['article']['summary'];?>">
+summary="<?php echo _b_('Contenu du message'); ?>">
   <tr>
     <th colspan="2">
-      <?php echo $locale['article']['headers'];?>
+      <?php echo _b_('En-têtes'); ?>
     </th>
   </tr>
 <?php
 foreach ($news['headdisp'] as $nick) {
   if (isset($post->headers->$nick)) 
-    echo "<tr><td class=\"{$css['bicoltitre']}\">{$locale['headers'][$nick]}</td>"
+    echo "<tr><td class=\"{$css['bicoltitre']}\">".header_translate($nick)."</td>"
     ."<td>".formatdisplayheader($nick,$post->headers->$nick,$spool)
     ."</td></tr>\n";
 }
 ?>
   <tr>
     <th colspan="2">
-      <?php echo $locale['article']['body'];?>
+      <?php echo _b_('Corps'); ?>
     </th>
   </tr> 
   <tr>
@@ -103,7 +99,7 @@ foreach ($news['headdisp'] as $nick) {
   </tr>
   <tr>
     <th colspan="2">
-      <?php echo $locale['article']['overview'];?>
+      <?php echo _b_('Aperçu'); ?>
     </th>
   </tr> 
   <tr>
@@ -120,5 +116,5 @@ $spool->disp($ndx-$news['threadtop'],$ndx+$news['threadbottom'],$ndx);
 <?php
 displayshortcuts();
 
-require("include/footer.inc.php");
+require_once("include/footer.inc.php");
 ?>