[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/templates/default filters.tpl,1.3,1.4 filt
|
From: |
Angelo Tony Puglisi <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/templates/default filters.tpl,1.3,1.4 filters_blocks.tpl,1.1,1.2 |
|
Date: |
Sun, 20 Jan 2002 18:58:49 -0500 |
Update of /cvsroot/phpgroupware//email/templates/default
In directory subversions:/tmp/cvs-serv16451/email/templates/default
Modified Files:
filters.tpl filters_blocks.tpl
Log Message:
more filters work, multiple concurrent streams now work, end request will close
any open stream
Index: filters.tpl
===================================================================
RCS file: /cvsroot/phpgroupware//email/templates/default/filters.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** filters.tpl 18 Jan 2002 23:15:53 -0000 1.3
--- filters.tpl 20 Jan 2002 23:58:47 -0000 1.4
***************
*** 1,70 ****
<!-- BEGIN Sieve Mail Filters -->
- <br>
- <table width="90%" border="1" cellpadding="0" cellspacing="0"
align="center">
- <tr>
- <td width="100%" align="left">
- The data you submitted (if any) should be above this
table:
- </td>
- </tr>
- <tr>
- <td width="100%" align="left">
- {data_dump_info}
- </td>
- </tr>
- <tr>
- <td width="100%" align="left">
- What part of the message you can examine:<br>
- <font size="-1">
- <ul>
- <li>{lang_from}: Matches the From address in
the message header</li>
- <li>{lang_to}: Matches the To address in the
message header</li>
- <li>{lang_cc}: Matches the CC address in the
message header</li>
- <li>{lang_bcc}: Matches the Bcc address in the
message header</li>
- <li>{lang_recipient}: Matches either the To, CC
or Bcc addresses in the message header</li>
- <li>{lang_sender}: Matches the Sender address
in the message header</li>
- <li>{lang_subject}: Matches the Subject text in
the message header</li>
- <li>{lang_header}: Matches text in a chosen
message header</li>
- <li>{lang_size_larger}: Matches the size of the
message larger than X</li>
- <li>{lang_size_smaller}: Matches the size of
the message smaller than X</li>
- <li>{lang_allmessages}: Always matches</li>
- </ul>
- </font>
- </td>
- </tr>
- <tr>
- <td width="100%" align="left">
- What works:<br>
- <font size="-1">
- <ul>
- <li>only the 1st row of
"{lang_if_messages_match}" works</li>
- <li>when you submit the form, an IMAP search
*might* be done</li>
- <li>Rule Matches are siaplayed as a message
list, like a search result, up to about 20 hits</li>
- <li>to navigate athe whole result set, click
button "submit to mlist class"</li>
- <li>besides viewing results, NO actions
"{lang_take_actions}" are enabled yet</li>
- </ul>
- </font>
- </td>
- </tr>
- </table>
-
- <p> </p>
-
<FORM action="{form_edit_filter_action}" method="post">
! <h2><center>Sieve {filters_txt}<br>Semi-Dumb UI</center></h2>
! <table width="90%" border="0" align="center">
<tr bgcolor="{row_off}">
<td colspan="4" align="left">
! <font size="-1">
! {lang_name}:
</font>
- <input size="30" name="{filter_name_box_name}"
value="{filter_name}">
</td>
</tr>
<tr bgcolor="{row_on}">
<td colspan="4">
! <font color="000000"
face="">{lang_if_messages_match}:</font>
</td>
</tr>
--- 1,25 ----
<!-- BEGIN Sieve Mail Filters -->
<FORM action="{form_edit_filter_action}" method="post">
! <h3><center>{lang_email_filters} - <em>Semi-Dumb UI</em></center></h3>
! <table width="90%" border="0" cellpadding="3" cellspacing="2"
align="center">
<tr bgcolor="{row_off}">
<td colspan="4" align="left">
! <font
size="-1">{lang_filter_number}: <strong>[{filternum}]</strong>
!
! {lang_filter_name}: <input size="30"
name="{filter_name_box_name}" value="{filter_name_box_value}">
</font>
</td>
</tr>
+
+ <tr>
+ <td colspan="4"><font size="-1"> </font></td>
+ </tr>
+
<tr bgcolor="{row_on}">
<td colspan="4">
! <strong>{lang_if_messages_match}</strong>
</td>
</tr>
***************
*** 73,109 ****
<tr bgcolor="{row_off}">
<td align="center">
! <font size="-1">
! {V_account_and_or_ignore}
! </font>
</td>
<td align="center">
<font size="-1">
! <select
name="filter_{f_idx}[match_{match_rownum}_examine]">
! <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>
</td>
<td align="center">
<font size="-1">
! <select
name="filter_{f_idx}[match_{match_rownum}_comparator]">
! <option value="contains"
selected>{lang_contains}</option>
! <option
value="notcontains">{lang_notcontains}</option>
! </select>
</font>
</td>
<td align="center">
<font size="-1">
! <input size="20"
name="filter_{f_idx}[match_{match_rownum}_matchthis]"
value="{match_textbox_txt}">
</font>
</td>
--- 28,62 ----
<tr bgcolor="{row_off}">
<td align="center">
! <font size="-1">{V_match_left_td}</font>
</td>
<td align="center">
<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>
</td>
<td align="center">
<font size="-1">
! <select name="{comparator_selectbox_name}">
! <option value="contains"
selected>{lang_contains}</option>
! <option
value="notcontains">{lang_notcontains}</option>
! </select>
</font>
</td>
<td align="center">
<font size="-1">
! <input size="20" name="{matchthis_textbox_name}"
value="{match_textbox_txt}">
</font>
</td>
***************
*** 111,121 ****
<!-- END B_matches_row -->
</table>
! <p> </p>
!
! <table width="90%" border="0" align="center">
<tr bgcolor="{row_on}">
<td colspan="4">
! <font color="000000">{lang_take_actions}:</font>
</td>
</tr>
--- 64,74 ----
<!-- END B_matches_row -->
</table>
+
+ <br>
! <table width="90%" border="0" cellpadding="3" cellspacing="2"
align="center">
<tr bgcolor="{row_on}">
<td colspan="4">
! <strong>{lang_take_actions}</strong>
</td>
</tr>
***************
*** 124,144 ****
<td width="20%" align="center">
<font size="-1">
! {V_action_widget}
</font>
</td>
<td width="30%" align="center">
<font size="-1">
! {folder_listbox}
</font>
</td>
<td width="30%" align="center">
<font size="-1">
! {lang_or_enter_text}
! <input size="20"
name="filter_{f_idx}[action_{action_rownum}_actiontext]"
value="{action_textbox_txt}">
</font>
</td>
<td width="20%" align="center">
<font size="-1">
! <input type="checkbox"
name="filter_{f_idx}[action_{action_rownum}_stop_filtering]"
value="True"> {lang_stop_if_matched}
</font>
</td>
--- 77,98 ----
<td width="20%" align="center">
<font size="-1">
! {V_action_widget}
</font>
</td>
<td width="30%" align="center">
<font size="-1">
! {folder_listbox}
</font>
</td>
<td width="30%" align="center">
<font size="-1">
! {lang_or_enter_text}
! <input size="20" name="{action_textbox_name}"
value="{action_textbox_txt}">
</font>
</td>
<td width="20%" align="center">
<font size="-1">
! <input type="checkbox"
name="{stop_filtering_checkbox_name}" value="True"
{stop_filtering_checkbox_checked}>
! {lang_stop_if_matched}
</font>
</td>
***************
*** 147,151 ****
</table>
! <p> </p>
<table width="75%" border="0" cellPadding="0" cellSpacing="0">
--- 101,105 ----
</table>
! <br>
<table width="75%" border="0" cellPadding="0" cellSpacing="0">
***************
*** 155,159 ****
</td>
<td width="25%">
! <input type="submit" name="{form_edit_filter_btn_name}"
value="{lang_submit}">
<input type="reset" name="reset" value="{lang_clear}">
--- 109,113 ----
</td>
<td width="25%">
! <input type="submit" name="submit"
value="{lang_submit}">
<input type="reset" name="reset" value="{lang_clear}">
***************
*** 165,169 ****
<td width="25%">
! <input type="submit" name="{form_cancel_btn_name}"
value="{lang_cancel}">
</td>
--- 119,123 ----
<td width="25%">
! <input type="submit" name="cancel"
value="{lang_cancel}">
</td>
Index: filters_blocks.tpl
===================================================================
RCS file: /cvsroot/phpgroupware//email/templates/default/filters_blocks.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** filters_blocks.tpl 18 Jan 2002 23:15:53 -0000 1.1
--- filters_blocks.tpl 20 Jan 2002 23:58:47 -0000 1.2
***************
*** 3,7 ****
<!-- === block seperator == -->
! <!-- BEGIN B_account_and_or_ignore -->
<select name="{andor_select_name}">
<option value="ignore_me" selected><{lang_ignore_me1}></option>
--- 3,14 ----
<!-- === block seperator == -->
! <!-- BEGIN B_match_account_box -->
! {lang_inbox_for_account}<br>
! {account_multi_box}
! <!-- END B_match_account_box -->
!
! <!-- === block seperator == -->
!
! <!-- BEGIN B_match_and_or_ignore -->
<select name="{andor_select_name}">
<option value="ignore_me" selected><{lang_ignore_me1}></option>
***************
*** 9,18 ****
<option value="and">{lang_and}</option>
</select>
! <!-- END B_account_and_or_ignore -->
<!-- === block seperator == -->
<!-- BEGIN B_action_no_ignore -->
! <select name="{actionbox_name}">
<option value="keep">{lang_keep}</option>
<option value="discard">{lang_discard}</option>
--- 16,25 ----
<option value="and">{lang_and}</option>
</select>
! <!-- END B_match_and_or_ignore -->
<!-- === block seperator == -->
<!-- BEGIN B_action_no_ignore -->
! <select name="{actionbox_judgement_name}">
<option value="keep">{lang_keep}</option>
<option value="discard">{lang_discard}</option>
***************
*** 27,31 ****
<!-- BEGIN B_action_with_ignore_me -->
! <select name="{actionbox_name}">
<option value="ignore_me" selected><{lang_ignore_me2}></option>
<option value="keep">{lang_keep}</option>
--- 34,38 ----
<!-- BEGIN B_action_with_ignore_me -->
! <select name="{actionbox_judgement_name}">
<option value="ignore_me" selected><{lang_ignore_me2}></option>
<option value="keep">{lang_keep}</option>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/templates/default filters.tpl,1.3,1.4 filters_blocks.tpl,1.1,1.2,
Angelo Tony Puglisi <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: stocks/inc class.bo.inc.php,NONE,1.1 class.so.inc.php,NONE,1.1 class.ui.inc.php,NONE,1.1 hook_add_def_pref.inc.php,1.1,1.2 hook_home.inc.php,1.7,1.8 hook_preferences.inc.php,1.6,1.7 functions.inc.php,1.9,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: email/inc class.bofilters.inc.php,1.1,1.2 class.bofolder.inc.php,1.4,1.5 class.bopreferences.inc.php,1.12,1.13 class.mail_msg_base.inc.php,1.64,1.65 class.mail_msg_display.inc.php,1.32,1.33 class.mail_msg_wrappers.inc.php,1.24,1.25 class.uifilters.inc.php,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: stocks/inc class.bo.inc.php,NONE,1.1 class.so.inc.php,NONE,1.1 class.ui.inc.php,NONE,1.1 hook_add_def_pref.inc.php,1.1,1.2 hook_home.inc.php,1.7,1.8 hook_preferences.inc.php,1.6,1.7 functions.inc.php,1.9,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: email/inc class.bofilters.inc.php,1.1,1.2 class.bofolder.inc.php,1.4,1.5 class.bopreferences.inc.php,1.12,1.13 class.mail_msg_base.inc.php,1.64,1.65 class.mail_msg_display.inc.php,1.32,1.33 class.mail_msg_wrappers.inc.php,1.24,1.25 class.uifilters.inc.php,1.1,1.2
- Index(es):