Changeset 277 in subversion


Ignore:
Timestamp:
Jul 19, 2006 3:36:35 PM (7 years ago)
Author:
thomasb
Message:

Improved usability (Ticket #1483807) and HTML validity; applied patch #1328032; fixed bug #1443200

Location:
trunk/roundcubemail
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r276 r277  
    11CHANGELOG RoundCube Webmail 
    22--------------------------- 
     3 
     42006/07/19 (thomasb) 
     5---------- 
     6- Correct entity encoding of link urls (HTML validity) 
     7- Moved back button in compose step (Ticket #) 
     8- Added absolute URLs to several buttons (for "open in new window") 
     9 
    310 
    4112006/07/18 (thomasb) 

  • trunk/roundcubemail/program/include/main.inc

    r276 r277  
    12751275  static $s_button_count = 100; 
    12761276   
     1277  // these commands can be called directly via url 
     1278  $a_static_commands = array('compose', 'list'); 
     1279   
    12771280  $skin_path = $CONFIG['skin_path']; 
    12781281   
    … …  
    13531356                                $attrib['imageover'] ? $skin_path.$attrib['imageover'] : '')); 
    13541357 
    1355     // make valid href to task buttons 
     1358    // make valid href to specific buttons 
    13561359    if (in_array($attrib['command'], $MAIN_TASKS)) 
    1357       $attrib['href'] = ereg_replace('_task=[a-z]+', '_task='.$attrib['command'], $COMM_PATH); 
     1360      $attrib['href'] = htmlentities(ereg_replace('_task=[a-z]+', '_task='.$attrib['command'], $COMM_PATH)); 
     1361    else if (in_array($attrib['command'], $a_static_commands)) 
     1362      $attrib['href'] = htmlentities($COMM_PATH.'&_action='.$attrib['command']); 
    13581363    } 
    13591364 

  • trunk/roundcubemail/program/include/rcube_imap.inc

    r275 r277  
    502502     
    503503    list($begin, $end) = $this->_get_message_range($max, $page); 
    504      
    505     /*     
    506     if ($page=='all') 
    507       { 
    508       $begin = 0; 
    509       $end = $max; 
    510       } 
    511     else if (!$this->get_capability('sort') && $this->sort_order=='DESC') 
    512       { 
    513       $begin = $max - $this->page_size - $start_msg; 
    514       $end =   $max - $start_msg; 
    515       } 
    516     else 
    517       { 
    518       $begin = $start_msg; 
    519       $end   = $start_msg + $this->page_size; 
    520       } 
    521  
    522     if ($begin < 0) $begin = 0; 
    523     if ($end < 0) $end = $max; 
    524     if ($end > $max) $end = $max; 
    525         */ 
    526          
     504   
     505        // mailbox is empty 
     506    if ($begin >= $end) 
     507      return array(); 
     508         
    527509//console("fetch headers $start_msg to ".($start_msg+$this->page_size)." (msg $begin to $end)"); 
    528510 
    … …  
    554536      else 
    555537        { 
    556         $msgs = sprintf("%d:%d", $begin+1, $end); 
     538        $msgs = sprintf("%d:%d", $begin+1, $end);         
    557539        $sorted = FALSE; 
    558540        } 

  • trunk/roundcubemail/program/lib/imap.inc

    r270 r277  
    17561756                $line=iil_MultLine($fp, $line); 
    17571757                $a = explode(" ", $line); 
    1758                 if (($line[0]=="*") && ($a[1]=="LSUB")){ 
     1758                if (($line[0]=="*") && ($a[1]=="LSUB" || $a[1]=="LIST")){ 
    17591759                        $line = rtrim($line); 
    17601760            // split one line 

  • trunk/roundcubemail/program/steps/mail/show.inc

    r203 r277  
    110110                        show_bytes($attach_prop['size'])); 
    111111      else 
    112         $out .= sprintf('<li><a href="%s&_part=%s" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n", 
    113                         $GET_URL, 
     112        $out .= sprintf('<li><a href="%s&amp;_part=%s" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n", 
     113                        htmlentities($GET_URL), 
    114114                        $attach_prop['part_id'], 
    115115                        $JS_OBJECT_NAME, 

  • trunk/roundcubemail/skins/default/templates/compose.html

    r276 r277  
    3939 
    4040<div id="messagetoolbar"> 
    41 <roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" /> 
     41<!--<roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />--> 
    4242<roundcube:button command="send" imageSel="/images/buttons/send_sel.png" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" /> 
    43 <!--<roundcube:button command="contacts" imageSel="/images/buttons/contacts_sel.png" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="addressbook" />--> 
    4443<roundcube:button command="spellcheck" imageSel="/images/buttons/spellcheck_sel.png" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" /> 
    4544<roundcube:button command="add-attachment" imageSel="/images/buttons/attach_sel.png" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" /> 
    … …  
    5756 
    5857<div id="compose-container"> 
    59 <table border="0" cellspacing="0" cellpadding="1" style="width:100%; height:100%;" summary=""><tr> 
     58<table border="0" cellspacing="0" cellpadding="1" style="width:100%; height:99%;" summary=""> 
     59<tbody> 
     60<tr> 
    6061<td> 
    6162 
    62 <table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary=""><tr> 
     63<table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary=""> 
     64<tbody><tr> 
    6365 
    6466<td class="title"><label for="rcmcomposefrom"><roundcube:label name="from" /></label></td> 
    … …  
    8789<td><roundcube:object name="composeHeaders" part="replyto" form="form" id="rcmcomposereplyto" size="80" tabindex="5" /></td> 
    8890 
    89 <!-- </tr><tr> 
    90  
    91 <td><roundcube:object name="composeAttachment" size="20" /></td> --> 
    92  
    9391</tr><tr> 
    9492 
    … …  
    9694<td><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td> 
    9795 
    98 </tr></table> 
     96</tr> 
     97</tbody> 
     98</table> 
    9999 
    100100</td> 
    … …  
    103103 
    104104<td style="width:100%; height:95%; vertical-align:top;"> 
    105 <roundcube:object name="composeBody" id="compose-body" form="form" cols="80" rows="20" wrap="virtual" tabindex="7" /><br /> 
     105<roundcube:object name="composeBody" id="compose-body" form="form" cols="80" rows="20" wrap="virtual" tabindex="7" /> 
     106</td> 
     107 
     108</tr><tr> 
     109 
     110<td> 
     111 
     112<table border="0" cellspacing="0" width="100%" summary=""><tbody><tr> 
     113 
     114<td> 
     115<roundcube:button type="input" command="send" class="button" label="sendmessage" /> 
     116<roundcube:button type="input" command="list" class="button" label="cancel" /> 
     117</td> 
     118<td align="right"> 
    106119<roundcube:label name="charset" />:&nbsp;<roundcube:object name="charsetSelector" tabindex="8" /> 
    107120</td> 
    108121 
    109 </tr></table> 
     122</tr></tbody></table> 
     123 
     124</td> 
     125</tr> 
     126</tbody> 
     127</table> 
    110128 
    111129</div> 
    … …  
    131149</script> 
    132150 
    133 <!-- 
    134 <div id="attachment-form"> 
    135 <roundcube:object name="composeAttachment" size="20" /><br /> 
    136 <input type="button" value="<roundcube:label name='close' />" onclick="rcmail_show_attachment_form(0)" /> 
    137 <input type="button" value="<roundcube:label name='send' />" onclick="rcmail.command('send-attachment', this)" /> 
    138 </div> 
    139 --> 
    140151 
    141152</body> 
Note: See TracChangeset for help on using the changeset viewer.