[imp] link to show/hide deleted messages (patch 2)

[Jan Kuipers]

Quoting Graeme Wood <Graeme.Wood at ed.ac.uk>:

> No that doesn't work either. It is doing the wrong thing with the virtual
> inbox. It is showing links if you have previously clicked on hide deleted.
>
> On Tue, 21 Mar 2006, Jan Kuipers wrote:
>
>> The patches were created for FW3 (cvs) code. The function should be as
>> follows:
>>
>> function showDeleteLinks()
>>      {
>>          if ((!$GLOBALS['prefs']->getValue('use_trash') &&
>>              !$GLOBALS['prefs']->getValue('use_vtrash') &&
>>              is_null($GLOBALS['imp_search']->isVINBOXFolder())) ||
>>              $GLOBALS['prefs']->getValue('delhide') ||
>>              $this->_showdelete) {
>>              $ret_array = array('purge' => true);
>>              $ret_array['hide'] = ($this->sortby() != SORTTHREAD);
>>          } else {
>>              $ret_array = array('hide' => false, 'purge' => false);
>>          }
>>
>>          return $ret_array;
>>      }
>>
>>
>
> --
> =============================================================================
> Graeme Wood                                 Email: Graeme.Wood at ed.ac.uk
> Unix Systems Support                        Phone: +44 131 650 5003
> The University of Edinburgh                 Fax:   +44 131 650 6552
> =============================================================================
>

Please try this one:

function showDeleteLinks()
{
     if (!$GLOBALS['prefs']->getValue('use_trash') &&
         !$GLOBALS['prefs']->getValue('use_vtrash') &&
         $GLOBALS['imp_search']->isVINBOXFolder() &&
         ($GLOBALS['prefs']->getValue('delhide') || $this->_showdelete)) {
         $ret_array = array('purge' => true);
         $ret_array['hide'] = ($this->sortby() != SORTTHREAD);
     } else {
         $ret_array = array('hide' => false, 'purge' => false);
     }
         return $ret_array;
}


-- 
Jan Kuipers,
Systeembeheer Lauwers College