[Hastymail-cvs] SF.net SVN: hastymail:[1466] trunk/hastymail2/lib/url_action_classes/ message.php

[<sai...@us...>]

Revision: 1466
          http://hastymail.svn.sourceforge.net/hastymail/?rev=1466&view=rev
Author:   sailfrog
Date:     2010-04-25 23:40:28 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
more HTML message view updates

Modified Paths:
--------------
    trunk/hastymail2/lib/url_action_classes/message.php

Modified: trunk/hastymail2/lib/url_action_classes/message.php
===================================================================
--- trunk/hastymail2/lib/url_action_classes/message.php	2010-04-25 23:09:16 UTC (rev 1465)
+++ trunk/hastymail2/lib/url_action_classes/message.php	2010-04-25 23:40:28 UTC (rev 1466)
@@ -38,6 +38,12 @@
     global $sticky_url;
     $user->page_data['top_link'] = '<a href="'.$sticky_url.'#top">'.$user->str[186].'</a>';
     if ($user->logged_in) {
+        if (isset($_SESSION['iframe_content']) && $_SESSION['iframe_content'] && isset($get['inline_html']) && $get['inline_html']) {
+            ob_clean();
+            echo $_SESSION['iframe_content'];
+            unset($_SESSION['iframe_content']);
+            exit;
+        }
         do_work_hook('message_page_start');
         $user->page_data['unseen_uids'] = 0;
         $user->page_data['show_previous_options'] = 0;
@@ -107,12 +113,6 @@
                 $user->page_data['filter_by'] = $filter_by;
                 $user->page_data['sort_by'] = $sort_by;
                 if ($imap->select_mailbox($mailbox, $sort_by, false, true, $filter_by)) {
-                    if (isset($get['inline_html']) && $get['inline_html']) {
-                        ob_clean();
-                        echo $_SESSION['iframe_content'];
-                        unset($_SESSION['iframe_content']);
-                        exit;
-                    }
                     if (isset($_SESSION['last_prev_next_folder'])) {
                         $user->page_data['last_prev_next_folder'] = $_SESSION['last_prev_next_folder'];
                     }
@@ -436,6 +436,12 @@
                                         }
                                         $_SESSION['iframe_content'] = $pd->print_message_iframe_content();
                                     }
+                                    /*if (isset($get['inline_html']) && $get['inline_html']) {
+                                        ob_clean();
+                                        echo $_SESSION['iframe_content'];
+                                        unset($_SESSION['iframe_content']);
+                                        exit;
+                                    }*/
                                     if (strstr($type, 'x-vcard')) {
                                         require_once($include_path.'lib'.$fd.'vcard.php');
                                         $vcard = hm_new('vcard');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.