[Hastymail-cvs] SF.net SVN: hastymail:[2029] trunk/hastymail2/lib/site_page_class.php

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

Revision: 2029
          http://hastymail.svn.sourceforge.net/hastymail/?rev=2029&view=rev
Author:   sailfrog
Date:     2012-01-16 17:48:46 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
don't show the "empty trash" button on the new mail page when the trash folder is the currently selected mailbox

Modified Paths:
--------------
    trunk/hastymail2/lib/site_page_class.php

Modified: trunk/hastymail2/lib/site_page_class.php
===================================================================
--- trunk/hastymail2/lib/site_page_class.php	2012-01-16 17:45:56 UTC (rev 2028)
+++ trunk/hastymail2/lib/site_page_class.php	2012-01-16 17:48:46 UTC (rev 2029)
@@ -378,7 +378,7 @@
     global $sticky_url;
     global $page_id;
     $data = '<input type="hidden" name="current_mailbox" value="'.$this->user->htmlsafe($this->pd['mailbox']).'" />';
-    if (isset($this->pd['settings']['trash_folder']) && $this->pd['settings']['trash_folder'] == $this->pd['mailbox']) {
+    if (isset($this->pd['settings']['trash_folder']) && $this->pd['settings']['trash_folder'] == $this->pd['mailbox'] && $this->dsp_page != 'new') {
         $data .= '<input type="submit" onclick="return hm_confirm(\''.$this->user->str['421'].'\');" class="empty_trash_btn" name="empty_trash" value="'.$this->user->str[420].'" />';
     }
     $data .= '<input type="submit" '.
@@ -421,7 +421,7 @@
 }
 function print_message_controls2() {
     $data = '';
-    if (isset($this->pd['settings']['trash_folder']) && $this->pd['settings']['trash_folder'] == $this->pd['mailbox']) {
+    if (isset($this->pd['settings']['trash_folder']) && $this->pd['settings']['trash_folder'] == $this->pd['mailbox'] && $this->dsp_page != 'new') {
         $data .= '<input type="submit" onclick="return hm_confirm(\''.$this->user->str[421].'\');" class="empty_trash_btn" name="empty_trash" value="'.$this->user->str[420].'" />';
     }
     $data .= '<input type="submit" class="delete_btn" name="delete_message" onclick="'.

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