From 98c14aa5dc9bd9b76c676ab1fbf22c82bfe79751 Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Wed, 12 Jul 2006 17:08:00 +0000
Subject: [PATCH] Merge x-org-id and from header. Use loupe.gif image as a link
 instead of [fiche]

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@453 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 include/banana.inc.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/banana.inc.php b/include/banana.inc.php
index bb967e3..56f9894 100644
--- a/include/banana.inc.php
+++ b/include/banana.inc.php
@@ -21,17 +21,15 @@
 
 require_once('banana/banana.inc.php');
 
-function hook_formatDisplayHeader($_header,$_text) {
-    global $globals;
-    if ($_header == 'x-org-id') {
-        return $_text . ' [<a href="' . $globals->baseurl . '/profile/' 
-             . $_text . '" class="popup2">fiche</a>]';
-    }
-}
-
-function hook_headerTranslate($hdr) {
-    if ($hdr == 'x-org-id') {
-        return 'Identité';
+function hook_formatDisplayHeader($_header, $_text) {
+    global $globals, $banana;
+    if ($_header == 'from') {
+        $id = $banana->post->headers['x-org-id'];
+        $_text = formatFrom($_text);
+        return $_text . ' <a href="' . $globals->baseurl . '/profile/' 
+             . $id . '" class="popup2" title="' . $id . '">'
+             . '<img src="' . $globals->baseurl . '/images/loupe.gif" alt="fiche" title="fiche" />'
+             . '</a>';
     }
 }
 
@@ -143,7 +141,7 @@ class PlatalBanana extends Banana
                   WHERE  uid={?}", $uid);
         $this->profile['subscribe'] = $req->fetchColumn();
 
-        array_splice($this->show_hdr,  count($this->show_hdr)  - 2, 0, 'x-org-id');
+        array_splice($this->show_hdr,  count($this->show_hdr)  - 2, 0);
         array_splice($this->parse_hdr, count($this->parse_hdr) - 2, 0, 'x-org-id');
 
         $this->host = 'news://web_'.Session::get('forlife')
-- 
2.1.4