X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fmessage_details%2Fsetup.php;h=d5a8a131a4b46083db21cb727f583976ed3124e5;hb=fab8e10c8f59d59185e24bbbddf6c37862ac7d49;hp=7e9ccf74f11b53b4c821091bf4f877ab641adbdc;hpb=47ccfad452e8d345542d09e59112cac317cffed8;p=squirrelmail.git

diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php
index 7e9ccf74..d5a8a131 100644
--- a/plugins/message_details/setup.php
+++ b/plugins/message_details/setup.php
@@ -7,7 +7,7 @@
  *
  * @author Marc Groot Koerkamp
  * @copyright © 2002 Marc Groot Koerkamp, The Netherlands
- * @copyright © 2002-2006 The SquirrelMail Project Team
+ * @copyright © 2002-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -29,34 +29,34 @@ function squirrelmail_plugin_init_message_details()
  * Add message details link in message view
  * @access private
  */
-function show_message_details() {
-    global $passed_id, $mailbox, $ent_num,
-           $javascript_on;
-
+function show_message_details(&$links) {
+    global $passed_id, $mailbox, $passed_ent_id;
+    
     if (strlen(trim($mailbox)) < 1) {
         $mailbox = 'INBOX';
     }
 
-    $params = '?passed_ent_id=' . $ent_num .
+    $params = '?passed_ent_id=' . $passed_ent_id .
               '&mailbox=' . urlencode($mailbox) .
               '&passed_id=' . $passed_id;
 
-    $print_text = _("View Message details");
+    $url = checkForJavascript() ? 'javascript:MessageSource();' : 
+        '../plugins/message_details/message_details_main.php' .
+        $params;
 
-    $result = '';
     /* Output the link. */
-    if ($javascript_on) {
-        $result = '<script type="text/javascript" language="javascript">' . "\n" .
+    $links[] = array('URL' => $url,
+        'Text' => _("View Message details") );
+
+    if (checkForJavascript()) {
+        echo '<script type="text/javascript">' . "\n" .
                 '<!--' . "\n" .
                 "  function MessageSource() {\n" .
                 '    window.open("../plugins/message_details/message_details_main.php' .
                         $params . '","MessageDetails","width=800,height=600");' . "\n".
                 "  }\n" .
                 "// -->\n" .
-                "</script>\n" .
-                "&nbsp;|&nbsp;<a href=\"javascript:MessageSource();\">$print_text</a>\n";
+                "</script>\n\n";
     }
-    echo $result;
 }
 
-?>
\ No newline at end of file