[Phpgroupware-cvs] CVS: email/templates/default filters.tpl,1.4,1.5 filters_blocks.tpl,1.2,1.3

[Angelo Tony Puglisi <address@hidden>]

Update of /cvsroot/phpgroupware//email/templates/default
In directory subversions:/tmp/cvs-serv3909/email/templates/default

Modified Files:
        filters.tpl filters_blocks.tpl 
Log Message:
implement saving and reading user submitted filter data from prefs, and 
preselecting saved values on the edit page

Index: filters.tpl
===================================================================
RCS file: /cvsroot/phpgroupware//email/templates/default/filters.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** filters.tpl 20 Jan 2002 23:58:47 -0000      1.4
--- filters.tpl 22 Jan 2002 13:16:34 -0000      1.5
***************
*** 1,6 ****
  <!-- BEGIN Sieve Mail Filters -->
  
! <FORM action="{form_edit_filter_action}" method="post">
!               
        <h3><center>{lang_email_filters} - <em>Semi-Dumb UI</em></center></h3>
        
--- 1,7 ----
  <!-- BEGIN Sieve Mail Filters -->
  
! <form action="{form_edit_filter_action}" method="post">
!       <input type="hidden" name="filter_num" value="{filter_num}">
!       
        <h3><center>{lang_email_filters} - <em>Semi-Dumb UI</em></center></h3>
        
***************
*** 8,12 ****
        <tr bgcolor="{row_off}">
                <td colspan="4" align="left">
!                       <font 
size="-1">{lang_filter_number}:&nbsp;<strong>[{filternum}]</strong>
                        &nbsp;&nbsp;
                        {lang_filter_name}:&nbsp;<input size="30" 
name="{filter_name_box_name}" value="{filter_name_box_value}">
--- 9,13 ----
        <tr bgcolor="{row_off}">
                <td colspan="4" align="left">
!                       <font 
size="-1">{lang_filter_number}:&nbsp;<strong>[{filter_num}]</strong>
                        &nbsp;&nbsp;
                        {lang_filter_name}:&nbsp;<input size="30" 
name="{filter_name_box_name}" value="{filter_name_box_value}">
***************
*** 33,48 ****
                        <font size="-1">
                        <select name="{examine_selectbox_name}">
!                               <option value="from">{lang_from}</option>
!                               <option value="to">{lang_to}</option>
!                               <option value="cc">{lang_cc}</option>
!                               <option value="bcc">{lang_bcc}</option>
!                               <option 
value="recipient">{lang_recipient}</option>
!                               <option value="sender">{lang_sender}</option>
!                               <option value="subject">{lang_subject}</option>
!                               <option value="header">{lang_header}</option>
!                               <option 
value="size_larger">{lang_size_larger}</option>
!                               <option 
value="size_smaller">{lang_size_smaller}</option>
!                               <option 
value="allmessages">{lang_allmessages}</option>
!                               <option value="body">{lang_body}</option>
                        </select>
                        </font>
--- 34,49 ----
                        <font size="-1">
                        <select name="{examine_selectbox_name}">
!                               <option value="from" 
{from_selected}>{lang_from}</option>
!                               <option value="to" 
{to_selected}>{lang_to}</option>
!                               <option value="cc" 
{cc_selected}>{lang_cc}</option>
!                               <!-- <option value="bcc">{lang_bcc}</option> -->
!                               <!-- <option 
value="recipient">{lang_recipient}</option> -->
!                               <!-- <option 
value="sender">{lang_sender}</option> -->
!                               <option value="subject" 
{subject_selected}>{lang_subject}</option>
!                               <!-- <option 
value="header">{lang_header}</option> -->
!                               <!-- <option 
value="size_larger">{lang_size_larger}</option> -->
!                               <!-- <option 
value="size_smaller">{lang_size_smaller}</option> -->
!                               <!-- <option 
value="allmessages">{lang_allmessages}</option> -->
!                               <!-- <option value="body">{lang_body}</option> 
-->
                        </select>
                        </font>
***************
*** 51,56 ****
                        <font size="-1">
                        <select name="{comparator_selectbox_name}">
!                               <option value="contains" 
selected>{lang_contains}</option>
!                               <option 
value="notcontains">{lang_notcontains}</option>
                        </select>
                        </font>
--- 52,57 ----
                        <font size="-1">
                        <select name="{comparator_selectbox_name}">
!                               <option value="contains" 
{contains_selected}>{lang_contains}</option>
!                               <option value="notcontains" 
{notcontains_selected}>{lang_notcontains}</option>
                        </select>
                        </font>

Index: filters_blocks.tpl
===================================================================
RCS file: /cvsroot/phpgroupware//email/templates/default/filters_blocks.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** filters_blocks.tpl  20 Jan 2002 23:58:47 -0000      1.2
--- filters_blocks.tpl  22 Jan 2002 13:16:34 -0000      1.3
***************
*** 12,18 ****
  <!-- BEGIN B_match_and_or_ignore -->
  <select name="{andor_select_name}">
!       <option value="ignore_me" selected>&lt;{lang_ignore_me1}&gt;</option>
!       <option value="or">{lang_or}</option>
!       <option value="and">{lang_and}</option>
  </select>
  <!-- END B_match_and_or_ignore -->
--- 12,18 ----
  <!-- BEGIN B_match_and_or_ignore -->
  <select name="{andor_select_name}">
!       <option value="ignore_me" 
{ignore_me_selected}>&lt;{lang_ignore_me1}&gt;</option>
!       <option value="or" {or_selected}>{lang_or}</option>
!       <option value="and" {and_selected}>{lang_and}</option>
  </select>
  <!-- END B_match_and_or_ignore -->
***************
*** 22,30 ****
  <!-- BEGIN B_action_no_ignore -->
  <select name="{actionbox_judgement_name}">
!       <option value="keep">{lang_keep}</option>
!       <option value="discard">{lang_discard}</option>
!       <option value="reject">{lang_reject}</option>
!       <option value="redirect">{lang_redirect}</option>
        <option value="fileinto" selected>{lang_fileinto}</option>
  </select>
  
--- 22,31 ----
  <!-- BEGIN B_action_no_ignore -->
  <select name="{actionbox_judgement_name}">
!       <!-- <option value="keep">{lang_keep}</option> -->
!       <!-- <option value="discard">{lang_discard}</option> -->
!       <!-- <option value="reject">{lang_reject}</option> -->
!       <!-- <option value="redirect">{lang_redirect}</option> -->
        <option value="fileinto" selected>{lang_fileinto}</option>
+       <!-- <option value="flag">{lang_flag}</option> -->
  </select>
  
***************
*** 36,44 ****
  <select name="{actionbox_judgement_name}">
        <option value="ignore_me" selected>&lt;{lang_ignore_me2}&gt;</option>
!       <option value="keep">{lang_keep}</option>
!       <option value="discard">{lang_discard}</option>
!       <option value="reject">{lang_reject}</option>
!       <option value="redirect">{lang_redirect}</option>
        <option value="fileinto">{lang_fileinto}</option>
  </select>
  
--- 37,46 ----
  <select name="{actionbox_judgement_name}">
        <option value="ignore_me" selected>&lt;{lang_ignore_me2}&gt;</option>
!       <!-- <option value="keep">{lang_keep}</option> -->
!       <!-- <option value="discard">{lang_discard}</option> -->
!       <!-- <option value="reject">{lang_reject}</option> -->
!       <!-- <option value="redirect">{lang_redirect}</option> -->
        <option value="fileinto">{lang_fileinto}</option>
+       <!-- <option value="flag">{lang_flag}</option> -->
  </select>