Changeset 7198044 in github


Ignore:
Timestamp:
May 17, 2007 1:01:22 PM (6 years ago)
Author:
thomascube <thomas@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
a549a92
Parents:
e3caaf5
Message:

Fixed conditional template tags; hide quota display if imap server does not support it

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • program/include/rcmail_template.inc

    rf115416 r7198044  
    340340 
    341341          if ($condmet) 
    342             $result = $submatches[0] . preg_replace('/.*<roundcube:endif\s+[^>]+>/is', '', $submatches[3]); 
     342            $result = $submatches[0] . ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>/Uis', '', $submatches[3], 1) : $submatches[3]); 
    343343          else 
    344344            $result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3]; 

  • program/steps/mail/func.inc

    rf115416 r7198044  
    6464// set current mailbox in client environment 
    6565$OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name()); 
    66 //$OUTPUT->set_pagetitle(rcube_charset_convert($IMAP->get_mailbox_name(), 'UTF-7', 'UTF-8')); 
     66$OUTPUT->set_env('quota', $IMAP->get_capability('quota')); 
    6767 
    6868if ($CONFIG['trash_mbox']) 

  • skins/default/templates/mail.html

    ra7d5c648 r7198044  
    7878<roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />&nbsp; 
    7979<roundcube:button command="select-none" label="none" classAct="active" /> &nbsp;&nbsp;&nbsp; 
     80<roundcube:if condition="env:quota" /> 
    8081<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="120" id="quotadisplay" /> 
     82<roundcube:endif /> 
    8183</div> 
    8284 
Note: See TracChangeset for help on using the changeset viewer.