X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fmessage_details%2Fsetup.php;h=c7270be5cbbbbbbda12b415b7f9effb35ce694ec;hb=d1e68dd096ad11c43b582028a1e66cc9be07c76d;hp=4f68e9bd549e381f8a175c6db6bbfd6bb3f2f530;hpb=7dc3c1a96de1ee317b6565dad912e672f7627b4b;p=squirrelmail.git

diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php
index 4f68e9bd..c7270be5 100644
--- a/plugins/message_details/setup.php
+++ b/plugins/message_details/setup.php
@@ -1,18 +1,22 @@
 <?php
-/** Message Source  
-*
-* Plugin to view the RFC822 raw message output and the bodystructure of a message
-*
-* Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-* 
-* $Id$
-* @package plugins
-* @subpackage message_details
-**/
+
+/**
+ * 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 &copy; 2002 Marc Groot Koerkamp, The Netherlands
+ * @copyright &copy; 2002-2009 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage message_details
+ **/
 
 /**
  * Initialize the plugin
+ * @access private
  */
 function squirrelmail_plugin_init_message_details()
 {
@@ -21,34 +25,40 @@ function squirrelmail_plugin_init_message_details()
   $squirrelmail_plugin_hooks['read_body_header_right']['message_details'] = 'show_message_details';
 }
 
-function show_message_details() {
-    global $passed_id, $mailbox, $ent_num, $color,
-           $javascript_on;
-
+/**
+ * Add message details link in message view
+ * @access private
+ */
+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";
-    } 
-    echo $result;
+    $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";
+    }
 }
- 
-?>
+