Make message details link a non-relative URI. Thanks Thierry Godefroy

[squirrelmail.git] / plugins / message_details / setup.php

diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php
index 30ad3e3c1a89b646fe21787c3381a42b54be9ab4..95f49d51a430fd858aa0c81025a337797b0da184 100644 (file)
--- a/plugins/message_details/setup.php
+++ b/plugins/message_details/setup.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
  * Message Details plugin - main setup script
  *
  * Plugin to view the RFC822 raw message output and the bodystructure of a message
  *
  * @author Marc Groot Koerkamp
- * @copyright Copyright &copy; 2002 Marc Groot Koerkamp, The Netherlands
- * @copyright Copyright &copy; 2004 The SquirrelMail Project Team
+ * @copyright &copy; 2002 Marc Groot Koerkamp, The Netherlands
+ * @copyright &copy; 2002-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -28,34 +29,36 @@ 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" .
-                '<!--' . "\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";
+    $links[] = array('URL' => $url,
+        'Text' => _("View Message details") );
+
+    if (checkForJavascript()) {
+        echo '<script type="text/javascript">' . "\n"
+           . '<!--' . "\n"
+           . "  function MessageSource() {\n"
+           . '    window.open("' 
+           . sqm_baseuri() 
+           . 'plugins/message_details/message_details_main.php' .
+                        $params . '","MessageDetails","width=800,height=600");' . "\n"
+           . "  }\n"
+           . "// -->\n"
+           . "</script>\n\n";
     }
-    echo $result;
 }
 
-?>
\ No newline at end of file