[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc class.bofilters.inc.php,1.8,1.9 class.
|
From: |
Angelo Tony Puglisi <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.bofilters.inc.php,1.8,1.9 class.mail_msg_wrappers.inc.php,1.30,1.31 class.uifilters.inc.php,1.6,1.7 |
|
Date: |
Sat, 26 Jan 2002 07:45:53 -0500 |
Update of /cvsroot/phpgroupware//email/inc
In directory subversions:/tmp/cvs-serv2630/email/inc
Modified Files:
class.bofilters.inc.php class.mail_msg_wrappers.inc.php
class.uifilters.inc.php
Log Message:
better filter list and now runs all filters in list
Index: class.bofilters.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.bofilters.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.bofilters.inc.php 26 Jan 2002 07:55:52 -0000 1.8
--- class.bofilters.inc.php 26 Jan 2002 12:45:51 -0000 1.9
***************
*** 18,25 ****
'process_submitted_data' => True,
'delete_filter' => True,
! 'run_single_filter' => True,
! 'run_all_filters' => True
);
var $all_filters = Array();
var $filter_num = 0;
--- 18,25 ----
'process_submitted_data' => True,
'delete_filter' => True,
! 'do_filter' => True
);
+ var $not_set='-1';
var $all_filters = Array();
var $filter_num = 0;
***************
*** 36,42 ****
--- 36,44 ----
var $fake_folder_info = array();
+ var $do_filter_apply_all = True;
var $inbox_full_msgball_list = array();
var $each_row_result_mball_list = array();
var $each_acct_final_mball_list = array();
+ var $html_matches_table = '';
function bofilters()
***************
*** 66,70 ****
$GLOBALS['phpgw']->msg =
CreateObject("email.mail_msg");
}
!
if
($GLOBALS['phpgw']->msg->get_isset_arg('already_grab_class_args_gpc'))
{
--- 68,72 ----
$GLOBALS['phpgw']->msg =
CreateObject("email.mail_msg");
}
! $this->not_set = $GLOBALS['phpgw']->msg->not_set;
if
($GLOBALS['phpgw']->msg->get_isset_arg('already_grab_class_args_gpc'))
{
***************
*** 113,135 ****
function obtain_filer_num($get_next_avail_if_none=True)
{
! if ((isset($GLOBALS['HTTP_POST_VARS']['filter_num']))
! && ((string)$GLOBALS['HTTP_POST_VARS']['filter_num'] ==
$this->add_new_filter_token))
! {
! $filter_num = $this->get_next_avail_num();
! }
! elseif ((isset($GLOBALS['HTTP_GET_VARS']['filter_num']))
! && ((string)$GLOBALS['HTTP_GET_VARS']['filter_num'] ==
$this->add_new_filter_token))
{
! $filter_num = $this->get_next_avail_num();
! }
! elseif
((isset($GLOBALS['HTTP_POST_VARS']['filter_num']))
! && ((string)$GLOBALS['HTTP_POST_VARS']['filter_num'] !=
''))
! {
! $filter_num =
(int)$GLOBALS['HTTP_POST_VARS']['filter_num'];
}
! elseif ((isset($GLOBALS['HTTP_GET_VARS']['filter_num']))
! && ((string)$GLOBALS['HTTP_GET_VARS']['filter_num'] !=
''))
{
! $filter_num =
(int)$GLOBALS['HTTP_GET_VARS']['filter_num'];
}
elseif($get_next_avail_if_none == True)
--- 115,142 ----
function obtain_filer_num($get_next_avail_if_none=True)
{
! if ($this->debug > 0) { echo
'bofilters.obtain_filer_num: ENTERING ; $get_next_avail_if_none :
[<code>'.serialize($get_next_avail_if_none).'</code>]<br>'."\r\n"; }
! if (isset($GLOBALS['HTTP_POST_VARS']['filter_num']))
{
! if ($GLOBALS['HTTP_POST_VARS']['filter_num'] ==
$this->add_new_filter_token)
! {
! $filter_num =
$this->get_next_avail_num();
! }
! else
! {
! $filter_num =
$GLOBALS['HTTP_POST_VARS']['filter_num'];
! $filter_num = (int)$filter_num;
! }
}
! elseif (isset($GLOBALS['HTTP_GET_VARS']['filter_num']))
{
! if ($GLOBALS['HTTP_GET_VARS']['filter_num'] ==
$this->add_new_filter_token)
! {
! $filter_num =
$this->get_next_avail_num();
! }
! else
! {
! $filter_num =
$GLOBALS['HTTP_GET_VARS']['filter_num'];
! $filter_num = (int)$filter_num;
! }
}
elseif($get_next_avail_if_none == True)
***************
*** 139,150 ****
else
{
! $filter_num = False;
}
! return (int)$filter_num;
}
function get_next_avail_num()
{
! return count($this->all_filters)+4;
}
--- 146,158 ----
else
{
! $filter_num = $this->not_set;
}
! if ($this->debug > 0) { echo
'bofilters.obtain_filer_num: LEAVING ; returning $filter_num :
[<code>'.serialize($filter_num).'</code>]<br>'."\r\n"; }
! return $filter_num;
}
function get_next_avail_num()
{
! return count($this->all_filters);
}
***************
*** 303,357 ****
}
! function squash_all_filters_gap()
{
! $did_squash = False;
! //for ($i=0; $i < count($this->all_filters); $i++)
! for ($i=0; $i < 20; $i++)
{
! if ((!isset($this->all_filters[$i]))
! && (!isset($this->all_filters[$i+1])))
! {
! // ok
! }
! elseif ((isset($this->all_filters[$i]))
! && (isset($this->all_filters[$i+1])))
! {
! // good
! }
! elseif ((!isset($this->all_filters[$i]))
! && (isset($this->all_filters[$i+1]))
! && ($this->filter_exists($i+1)))
! {
! $move_me_down = array();
! $move_me_down =
$this->all_filters[$i+1];
! $this->all_filters[$i] = array();
! $this->all_filters[$i] = $move_me_down;
! $this->all_filters[$i+1] = array();
! unset($this->all_filters[$i+1]);
! $did_squash = True;
! break;
! }
}
! return $did_squash;
}
function save_all_filters_to_repository()
{
- if ($this->debug_set_prefs > 1) { echo
'bofilters.save_all_filters_to_repository: ENTERING<br>'; }
// KEY SORT so the filters are numbered in acending
array index order
- ksort($this->all_filters);
// SQUASH / COMPACT $this->all_prefs so there are NO
GAPS
! // use a while statement in the future, for now use $i
loop so we won't loop forever if something goes wrong
! for ($i=0; $i < 11; $i++)
! {
! $did_squash = $this->squash_all_filters_gap();
! if ($did_squash == False)
! {
! break;
! }
! }
!
! // KEY SORT so the filters are numbered in acending
array index order
! ksort($this->all_filters);
// now add this filter piece by piece
--- 311,338 ----
}
! function squash_and_sort_all_filters()
{
! // KEY SORT so the filters are numbered in acending
array index order
! ksort($this->all_filters);
!
! $new_all_filters = array();
! while(list($key,$value) = each($this->all_filters))
{
! $next_pos = count($new_all_filters);
! $this_filter = $this->all_filters[$key];
! $new_all_filters[$next_pos] = $this_filter;
}
! // ok, now we have a compacted list with no gaps
! $this->all_filters = array();
! $this->all_filters = $new_all_filters;
!
!
}
function save_all_filters_to_repository()
{
// KEY SORT so the filters are numbered in acending
array index order
// SQUASH / COMPACT $this->all_prefs so there are NO
GAPS
! $this->squash_and_sort_all_filters();
// now add this filter piece by piece
***************
*** 511,543 ****
! function run_all_filters()
{
! if ($this->debug > 0) { echo
'bofilters.run_all_filters: ENTERING<br>'; }
if (count($this->all_filters) == 0)
{
! if ($this->debug > 0) { echo
'bofilters.run_all_filters: LEAVING with ERROR, no filters exist<br>'; }
}
! for ($filter_idx=0; $filter_idx <
count($this->all_filters); $filter_idx++)
{
! // APPLY THIS FILTER
! if ($this->debug > 1) { echo
'bofilters.run_all_filters: calling
$this->run_single_filter['.$filter_idx.']<br>'; }
! $this->run_single_filter[$filter_idx];
}
! if ($this->debug > 0) { echo
'bofilters.run_all_filters: LEAVING<br>'; }
}
function run_single_filter($filter_num='')
{
! if ($this->debug > 0) { echo
'bofilters.run_single_filter: ENTERING<br>'; }
if (count($this->all_filters) == 0)
{
if ($this->debug > 0) { echo
'bofilters.run_single_filter: LEAVING with ERROR, no filters exist<br>'; }
}
- if ((!isset($filter_num))
- || (trim((string)$filter_num) == ''))
- {
- $filter_num = $this->obtain_filer_num();
- }
$filter_exists = $this->filter_exists($filter_num);
if (!$filter_exists)
--- 492,550 ----
! function do_filter()
{
! if ($this->debug > 0) { echo 'bofilters.do_filter:
ENTERING<br>'; }
if (count($this->all_filters) == 0)
{
! if ($this->debug > 0) { echo
'bofilters.do_filter: LEAVING with ERROR, no filters exist<br>'; }
}
+ // "False" means return $this->not_set if no filter
number was found anywhere
+ $found_filter_num = $this->obtain_filer_num(False);
+ if ($this->debug > 1) { echo
'bofilters.obtain_filer_num: $found_filter_num :
[<code>'.serialize($found_filter_num).'</code>]<br>'."\r\n"; }
! if ($found_filter_num == $this->not_set)
! {
! // NO filter number was specified, that means
run ALL filters
! $this->do_filter_apply_all = True;
! for ($filter_idx=0; $filter_idx <
count($this->all_filters); $filter_idx++)
! {
! if ($this->debug > 1) { echo
'bofilters.do_filter: run_all_finters_mode: calling
$this->run_single_filter['.$filter_idx.']<br>'; }
!
$this->run_single_filter((int)$filter_idx);
! }
! }
! else
! {
! // we were given a filter_num, that means run
THAT FILTER ONLY
! $this->do_filter_apply_all = False;
! if ($this->debug > 1) { echo
'bofilters.do_filter: run_single_filter mode: calling
$this->run_single_filter['.$found_filter_num.']<br>'; }
!
$this->run_single_filter((int)$found_filter_num);
! }
!
! // ok, filters have run, do we have a report to show?
! if ($this->just_testing())
{
! echo
'<html>'.$this->html_matches_table.'</html>';
}
! if ($this->debug > 1) { echo 'bofilters.do_filter:
calling end_request<br>'; }
! $GLOBALS['phpgw']->msg->end_request();
! if ($this->debug > 0) { echo 'bofilters.do_filter:
LEAVING<br>'; }
! $take_me_to_url = $GLOBALS['phpgw']->link(
!
'/index.php',
!
'menuaction=email.uifilters.filters_list');
! $take_me_to_href = '<a href="'.$take_me_to_url.'"> Go
Back </a>';
! //Header('Location: ' . $take_me_to_url);
! echo '<p> </p><br><p>'.$take_me_to_href.'</p>';
!
! if ($this->debug > 0) { echo 'bofilters.do_filter:
LEAVING<br>'; }
}
+ // PRIVATE
function run_single_filter($filter_num='')
{
! if ($this->debug > 0) { echo
'bofilters.run_single_filter: ENTERING, feed $filter_num :
[<code>'.serialize($filter_num).'</code>]<br>'; }
if (count($this->all_filters) == 0)
{
if ($this->debug > 0) { echo
'bofilters.run_single_filter: LEAVING with ERROR, no filters exist<br>'; }
}
$filter_exists = $this->filter_exists($filter_num);
if (!$filter_exists)
***************
*** 550,554 ****
! // WE NEED TO DO THIS FOR EVERY SOURCE ACCOUNT
$all_accounts_result_set = array();
$msgball_list = array();
--- 557,561 ----
! // WE NEED TO DO THIS FOR EVERY SOURCE ACCOUNT
specified in this filter
$all_accounts_result_set = array();
$msgball_list = array();
***************
*** 780,786 ****
// report
if ((count($all_accounts_result_set) > 0)
- && (isset($all_accounts_result_set[0]))
- && ((string)$all_accounts_result_set[0]['folder'] != '')
&& ($this->just_testing()))
{
--- 787,795 ----
// report
+ //if ((count($all_accounts_result_set) > 0)
+ //&& (isset($all_accounts_result_set[0]))
+ //&& ((string)$all_accounts_result_set[0]['folder'] !=
'')
+ //&& ($this->just_testing()))
if ((count($all_accounts_result_set) > 0)
&& ($this->just_testing()))
{
***************
*** 796,808 ****
// retrieve user displayable data for each
message in the result set
$this->result_set_mlist =
$GLOBALS['phpgw']->msg->get_msg_list_display($this->fake_folder_info,$all_accounts_result_set);
! $html_list = $this->make_mlist_box();
! echo
'<html><table>'.$html_list.'</table></html>';
}
! elseif ((count($all_accounts_result_set) > 0)
! && (isset($all_accounts_result_set[0]))
! && ((string)$all_accounts_result_set[0]['folder'] !=
''))
{
// NOT A TEST - APPLY THE ACTION(S)
if ($this->debug > 1) { echo
'bofilters.run_single_filter: NOT a Test, *Apply* the Action(s) ;
$this_filter[actions][0][judgement] :
['.$this_filter['actions'][0]['judgement'].']<br>'; }
if ($this_filter['actions'][0]['judgement'] ==
'fileinto')
{
--- 805,820 ----
// retrieve user displayable data for each
message in the result set
$this->result_set_mlist =
$GLOBALS['phpgw']->msg->get_msg_list_display($this->fake_folder_info,$all_accounts_result_set);
! // save this report data for later use, add it
to any other previous report
! $this->html_matches_table .=
! '<h3>Results for Filter
['.$filter_num.'] named: '.$this_filter['filtername'].'</h3>'."\r\n"
! .'<table>'
! .$this->make_mlist_box()
! .'</table>'."\r\n";
}
! elseif (count($all_accounts_result_set) > 0)
{
// NOT A TEST - APPLY THE ACTION(S)
if ($this->debug > 1) { echo
'bofilters.run_single_filter: NOT a Test, *Apply* the Action(s) ;
$this_filter[actions][0][judgement] :
['.$this_filter['actions'][0]['judgement'].']<br>'; }
+ // ACTION: FILEINTO
if ($this_filter['actions'][0]['judgement'] ==
'fileinto')
{
***************
*** 828,832 ****
// ERROR
if ($this->debug > 1) {
echo 'bofilters.run_single_filter: ERROR: industrial_interacct_mail_move
returns FALSE<br>'; }
! break;
}
}
--- 840,844 ----
// ERROR
if ($this->debug > 1) {
echo 'bofilters.run_single_filter: ERROR: industrial_interacct_mail_move
returns FALSE<br>'; }
! return False;
}
}
***************
*** 835,839 ****
{
// not yet coded action
! if ($this->debug > 1) { echo
'bofilters.run_single_filter: action not yet coded:
$this_filter[actions][0][judgement] :
['.$this_filter['actions'][0]['judgement'].']<br>'; }
}
}
--- 847,851 ----
{
// not yet coded action
! if ($this->debug > 1) { echo
'bofilters.run_single_filter: actions not yet coded:
$this_filter[actions][0][judgement] :
['.$this_filter['actions'][0]['judgement'].']<br>'; }
}
}
***************
*** 841,857 ****
{
// NO MATCHES
}
- if ($this->debug > 1) { echo
'bofilters.run_single_filter: calling end_request<br>'; }
- $GLOBALS['phpgw']->msg->end_request();
- if ($this->debug > 0) { echo
'bofilters.run_single_filter: LEAVING<br>'; }
- $take_me_to_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uifilters.filters_list');
-
- $take_me_to_href = '<a href="'.$take_me_to_url.'"> Go
Back </a>';
- //Header('Location: ' . $take_me_to_url);
- echo '<p> </p><br><p>'.$take_me_to_href.'</p>';
}
--- 853,866 ----
{
// NO MATCHES
+ if ($this->debug > 1) { echo
'bofilters.run_single_filter: NO MATCHES: $this_filter[filtername] :
['.$this_filter['filtername'].']<br>'; }
}
+ // cleanup
+ $this->each_row_result_mball_list = array();
+ $this->each_acct_final_mball_list = array();
+ $all_accounts_result_set = array();
+ if ($this->debug > 0) { echo
'bofilters.run_single_filter: LEAVING, return True because we made it to the
end of the function<br><br><br>'; }
+ return True;
}
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.mail_msg_wrappers.inc.php 25 Jan 2002 21:41:02 -0000 1.30
--- class.mail_msg_wrappers.inc.php 26 Jan 2002 12:45:51 -0000 1.31
***************
*** 606,609 ****
--- 606,611 ----
// INTERACCOUNT -OR- SAME ACCOUNT ?
$debug_move = 0;
+ //$debug_move = 3;
+ if ($debug_move > 2) { echo
'bofilters.run_single_filter: $to_fldball DUMP:<pre>'; print_r($to_fldball);
echo "</pre>\r\n"; }
// --- Establist account numbers ----
$mov_msgball['acctnum'] = (int)$mov_msgball['acctnum'];
***************
*** 626,637 ****
$common_acctnum = $mov_msgball['acctnum'];
! //if ($debug_move > 1) { echo
'mail_msg(_wrappers): interacct_mail_move: SAME ACCOUNT MOVE $common_acctnum:
'.$common_acctnum.' $mailsvr_stream: '.$mailsvr_stream.' $msgnum: '.$msgnum.'
$mailsvr_callstr: '.$mailsvr_callstr.' $mailbox: '.$mailbox.'<br>'; }
$this->expire_session_cache_item('msgball_list', $common_acctnum);
// we need to SELECT the folder the message is
being moved FROM
$this->ensure_stream_and_folder($mov_msgball,
'industrial_interacct_mail_move');
$to_fldball['folder'] =
urldecode($to_fldball['folder']);
$mailsvr_stream =
$this->get_arg_value('mailsvr_stream', $common_acctnum);
! if ($debug_move > 1) { echo
'mail_msg(_wrappers): interacct_mail_move: SAME ACCOUNT MOVE $common_acctnum:
'.$common_acctnum.' $mailsvr_stream: '.$mailsvr_stream.' $mov_msgball[msgnum]:
'.$mov_msgball['msgnum'].' $to_fldball[folder]: '.
$to_fldball['folder'].'<br>'; }
! return
$GLOBALS['phpgw_dcom_'.$common_acctnum]->dcom->mail_move($mailsvr_stream
,$mov_msgball['msgnum'], $to_fldball['folder']);
}
else
--- 628,649 ----
$common_acctnum = $mov_msgball['acctnum'];
! if ($debug_move > 1) { echo
'mail_msg(_wrappers): industrial_interacct_mail_move: SAME ACCOUNT MOVE
$common_acctnum: '.$common_acctnum.' $mailsvr_stream: '.$mailsvr_stream.'
$msgnum: '.$msgnum.' $mailsvr_callstr: '.$mailsvr_callstr.' $mailbox:
'.$mailbox.'<br>'; }
$this->expire_session_cache_item('msgball_list', $common_acctnum);
// we need to SELECT the folder the message is
being moved FROM
+ $mov_msgball['folder'] =
urldecode($mov_msgball['folder']);
$this->ensure_stream_and_folder($mov_msgball,
'industrial_interacct_mail_move');
+ $mov_msgball['msgnum'] =
(string)$mov_msgball['msgnum'];
$to_fldball['folder'] =
urldecode($to_fldball['folder']);
$mailsvr_stream =
$this->get_arg_value('mailsvr_stream', $common_acctnum);
! if ($debug_move > 1) { echo
'mail_msg(_wrappers): industrial_interacct_mail_move:
$GLOBALS[phpgw_dcom_'.$common_acctnum.']->dcom->mail_move('.serialize($mailsvr_stream).'
,'.serialize($mov_msgball['msgnum']).',
'.serialize($to_fldball['folder']).')<br>'; }
! $did_move =
$GLOBALS['phpgw_dcom_'.$common_acctnum]->dcom->mail_move($mailsvr_stream
,$mov_msgball['msgnum'], $to_fldball['folder']);
! if (!$did_move)
! {
! return False;
! }
! else
! {
! return
$this->phpgw_expunge($mov_msgball['acctnum']);
! }
}
else
***************
*** 639,642 ****
--- 651,655 ----
// DIFFERENT ACCOUNT MAIL MOVE
+ if ($debug_move > 1) { echo
'mail_msg(_wrappers): industrial_interacct_mail_move: Different ACCOUNT MOVE
$common_acctnum: '.$common_acctnum.' $mailsvr_stream: '.$mailsvr_stream.'
$msgnum: '.$msgnum.' $mailsvr_callstr: '.$mailsvr_callstr.' $mailbox:
'.$mailbox.'<br>'; }
$good_to_go = False;
// delete session msg array data thAt is now
stale
***************
*** 654,660 ****
$mov_msgball['part_no'] = 0;
// (a) the headers, specify part_no 0
! $moving_message =
$GLOBALS['phpgw']->msg->phpgw_fetchbody($mov_msgball);
// (b) the body, plus a CRLF, reuse
headers_msgball b/c "phpgw_body" cares not about part_no
! $moving_message .=
$GLOBALS['phpgw']->msg->phpgw_body($mov_msgball)."\r\n";
$good_to_go = (strlen($moving_message) > 3);
if (!$good_to_go)
--- 667,675 ----
$mov_msgball['part_no'] = 0;
// (a) the headers, specify part_no 0
! //$moving_message =
$GLOBALS['phpgw']->msg->phpgw_fetchbody($mov_msgball);
! $moving_message =
$this->phpgw_fetchbody($mov_msgball);
// (b) the body, plus a CRLF, reuse
headers_msgball b/c "phpgw_body" cares not about part_no
! //$moving_message .=
$GLOBALS['phpgw']->msg->phpgw_body($mov_msgball)."\r\n";
! $moving_message .=
$this->phpgw_body($mov_msgball)."\r\n";
$good_to_go = (strlen($moving_message) > 3);
if (!$good_to_go)
***************
*** 686,690 ****
return False;
}
! $good_to_go =
$GLOBALS['phpgw']->msg->phpgw_expunge($mov_msgball['acctnum']);
if (!$good_to_go)
{
--- 701,706 ----
return False;
}
! //$good_to_go =
$GLOBALS['phpgw']->msg->phpgw_expunge($mov_msgball['acctnum']);
! $good_to_go =
$this->phpgw_expunge($mov_msgball['acctnum']);
if (!$good_to_go)
{
Index: class.uifilters.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.uifilters.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uifilters.inc.php 26 Jan 2002 07:55:52 -0000 1.6
--- class.uifilters.inc.php 26 Jan 2002 12:45:51 -0000 1.7
***************
*** 117,121 ****
$apply_this_filter_url = $GLOBALS['phpgw']->link(
'/index.php',
!
'menuaction=email.bofilters.run_single_filter'
.'&filter_num='.$filter_num);
$apply_this_filter_href = '<a
href="'.$apply_this_filter_url.'"><b>*APPLY*</b> This Filter</a>';
--- 117,121 ----
$apply_this_filter_url = $GLOBALS['phpgw']->link(
'/index.php',
!
'menuaction=email.bofilters.do_filter'
.'&filter_num='.$filter_num);
$apply_this_filter_href = '<a
href="'.$apply_this_filter_url.'"><b>*APPLY*</b> This Filter</a>';
***************
*** 582,591 ****
$run_all_filters_url = $GLOBALS['phpgw']->link(
'/index.php',
!
'menuaction=email.bofilters.run_all_filters');
! $run_all_filters_href = '<a
href="'.$run_all_filters_url.'">'.lang('Run ALL Filters').'</a>';
$GLOBALS['phpgw']->template->set_var('run_all_filters_href',$run_all_filters_href);
$test_all_filters_url =
$run_all_filters_url.'&filter_test=1';
! $test_all_filters_href = '<a
href="'.$test_all_filters_url.'">Test Run All Filters</a>';
$GLOBALS['phpgw']->template->set_var('test_all_filters_href',$test_all_filters_href);
--- 582,591 ----
$run_all_filters_url = $GLOBALS['phpgw']->link(
'/index.php',
!
'menuaction=email.bofilters.do_filter');
! $run_all_filters_href = '<a
href="'.$run_all_filters_url.'">'.lang('<b>APPLY ALL</b> Filters').'</a>';
$GLOBALS['phpgw']->template->set_var('run_all_filters_href',$run_all_filters_href);
$test_all_filters_url =
$run_all_filters_url.'&filter_test=1';
! $test_all_filters_href = '<a
href="'.$test_all_filters_url.'">Test All Filters</a>';
$GLOBALS['phpgw']->template->set_var('test_all_filters_href',$test_all_filters_href);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.bofilters.inc.php,1.8,1.9 class.mail_msg_wrappers.inc.php,1.30,1.31 class.uifilters.inc.php,1.6,1.7,
Angelo Tony Puglisi <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: email/templates/default filters_list.tpl,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.3,1.4 class.bofilters.inc.php,1.9,1.10 class.uifilters.inc.php,1.7,1.8
- Previous by thread:
[Phpgroupware-cvs] CVS: email/templates/default filters_list.tpl,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: email/inc class.bocompose.inc.php,1.3,1.4 class.bofilters.inc.php,1.9,1.10 class.uifilters.inc.php,1.7,1.8
- Index(es):