phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] email/inc/class.bofilters.inc.php, 1.14.2.4


From: nomail
Subject: [Phpgroupware-cvs] email/inc/class.bofilters.inc.php, 1.14.2.4
Date: Sat, 6 Nov 2004 17:13:43 +0100

Update of /email/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.bofilters.inc.php

date: 2004/11/06 16:13:43;  author: powerstat;  state: Exp;  lines: +155 -155

Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/inc/class.bofilters.inc.php
diff -u email/inc/class.bofilters.inc.php:1.14.2.3 
email/inc/class.bofilters.inc.php:1.14.2.4
--- email/inc/class.bofilters.inc.php:1.14.2.3  Fri Feb  6 19:38:09 2004
+++ email/inc/class.bofilters.inc.php   Sat Nov  6 16:13:43 2004
@@ -84,7 +84,7 @@
                */
                function bofilters()
                {
-                       if ($this->debug > 0) { echo 'email.bofilters 
*constructor*: ENTERING <br>'; }
+                       if ($this->debug > 0) { echo 'email.bofilters 
*constructor*: ENTERING <br />'; }
                        
                        define('F_ROW_0_MATCH',1);
                        define('F_ROW_1_MATCH',2);
@@ -140,22 +140,22 @@
                        {
                                $my_menuaction = 'error: none found';
                        }
-                       if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*('.__LINE__.'): $my_menuaction ['.$my_menuaction.']<br>'; }
+                       if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*('.__LINE__.'): $my_menuaction ['.$my_menuaction.']<br />'; }
                        
                        if (stristr($my_menuaction, 'email.uifilter'))
                        {
-                               if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*('.__LINE__.'): GPC menuaction indicates this is a UI call, NOT 
applying filters, so do NOT html decode pref filter data<br>'; }
+                               if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*('.__LINE__.'): GPC menuaction indicates this is a UI call, NOT 
applying filters, so do NOT html decode pref filter data<br />'; }
                                $also_undo_defang = False;
                        }
                        else
                        {
-                               if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*('.__LINE__.'): GPC menuaction indicates this is NOT simply a UI 
call, so DO html decode (defang) pref filter data<br>'; } 
+                               if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*('.__LINE__.'): GPC menuaction indicates this is NOT simply a UI 
call, so DO html decode (defang) pref filter data<br />'; } 
                                $also_undo_defang = True;
                        }
                        
-                       if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*: calling 
$this->read_filter_data_from_prefs('.serialize($also_undo_defang).')<br>'; } 
+                       if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*: calling 
$this->read_filter_data_from_prefs('.serialize($also_undo_defang).')<br />'; } 
                        $this->read_filter_data_from_prefs($also_undo_defang);
-                       if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*: LEAVING<br>'; }
+                       if ($this->debug > 0) { echo 'email.bofilters. 
*constructor*: LEAVING<br />'; }
                        //return;
                }
                
@@ -177,7 +177,7 @@
                */
                function read_filter_data_from_prefs($also_undo_defang='')
                {
-                       if ($this->debug > 0) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): ENTERING, param 
$also_undo_defang ['.serialize($also_undo_defang).']<br>'."\r\n"; } 
+                       if ($this->debug > 0) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): ENTERING, param 
$also_undo_defang ['.serialize($also_undo_defang).']<br />'."\r\n"; } 
                        /*
                        $this->all_filters = array();
                        // read sublevel data from prefs
@@ -209,15 +209,15 @@
                        // UNDO the DATABASE DEFANG if instructions specified 
this
                        if ($also_undo_defang)
                        {
-                               if ($this->debug > 1) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): about to call 
$this->all_filters_bulk_undo_defang because param $also_undo_defang is 
['.serialize($also_undo_defang).']<br>'."\r\n"; }
+                               if ($this->debug > 1) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): about to call 
$this->all_filters_bulk_undo_defang because param $also_undo_defang is 
['.serialize($also_undo_defang).']<br />'."\r\n"; }
                                $this->all_filters_bulk_undo_defang();
                        }
                        else
                        {
-                               if ($this->debug > 1) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): leaving html encoded 
chars AS-IS because param $also_undo_defang is 
['.serialize($also_undo_defang).']<br>'."\r\n"; } 
+                               if ($this->debug > 1) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): leaving html encoded 
chars AS-IS because param $also_undo_defang is 
['.serialize($also_undo_defang).']<br />'."\r\n"; } 
                        }
                        if ($this->debug > 2) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): obtained 
$this->all_filters DUMP:<pre>'; print_r($this->all_filters); echo 
'</pre>'."\r\n"; } 
-                       if ($this->debug > 0) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): LEAVING <br>'."\r\n"; }
+                       if ($this->debug > 0) { echo 
'bofilters.read_filter_data_from_prefs('.__LINE__.'): LEAVING <br />'."\r\n"; }
                        return $this->all_filters;
                }
                
@@ -229,7 +229,7 @@
                */
                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 ($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['phpgw']->msg->ref_POST['filter_num']))
                        {
                                if 
($GLOBALS['phpgw']->msg->ref_POST['filter_num'] == $this->add_new_filter_token)
@@ -262,7 +262,7 @@
                        {
                                $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"; }
+                       if ($this->debug > 0) { echo 
'bofilters.obtain_filer_num: LEAVING ; returning $filter_num : 
[<code>'.serialize($filter_num).'</code>]<br />'."\r\n"; }
                        return $filter_num;
                }
                
@@ -328,21 +328,21 @@
                {
                        // "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.move_up: 
$found_filter_num : 
[<code>'.serialize($found_filter_num).'</code>]<br>'."\r\n"; }
+                       if ($this->debug > 1) { echo 'bofilters.move_up: 
$found_filter_num : [<code>'.serialize($found_filter_num).'</code>]<br 
/>'."\r\n"; }
                        
                        if ($found_filter_num == $this->not_set)
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.move_up: LEAVING with error, no filter num was found<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo 
'bofilters.move_up: LEAVING with error, no filter num was found<br />'."\r\n"; }
                                return False;
                        }
                        elseif($this->filter_exists($found_filter_num) == False)
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.move_up: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] does not exist<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo 
'bofilters.move_up: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] does not exist<br />'."\r\n"; }
                                return False;
                        }
                        elseif((string)$found_filter_num == '0')
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.move_up: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] can not be moved 
up<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo 
'bofilters.move_up: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] can not be moved up<br 
/>'."\r\n"; }
                                return False;
                        }
                        // if we get here we need to move up this filter
@@ -357,7 +357,7 @@
                        $take_me_to_url = $GLOBALS['phpgw']->link(
                                                                                
'/index.php',
                                                                                
'menuaction=email.uifilters.filters_list');
-                       if ($this->debug > 0 || $this->debug_set_prefs > 0 ) { 
echo 'bofilters.move_up: LEAVING with redirect to: 
<br>'.$take_me_to_url.'<br>'; }
+                       if ($this->debug > 0 || $this->debug_set_prefs > 0 ) { 
echo 'bofilters.move_up: LEAVING with redirect to: <br />'.$take_me_to_url.'<br 
/>'; }
                        Header('Location: ' . $take_me_to_url);
                }
                
@@ -370,21 +370,21 @@
                {
                        // "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.move_down: 
$found_filter_num : 
[<code>'.serialize($found_filter_num).'</code>]<br>'."\r\n"; }
+                       if ($this->debug > 1) { echo 'bofilters.move_down: 
$found_filter_num : [<code>'.serialize($found_filter_num).'</code>]<br 
/>'."\r\n"; }
                        
                        if ($found_filter_num == $this->not_set)
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.move_down: LEAVING with error, no filter num was found<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo 
'bofilters.move_down: LEAVING with error, no filter num was found<br 
/>'."\r\n"; }
                                return False;
                        }
                        elseif($this->filter_exists($found_filter_num) == False)
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.move_down: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] does not exist<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo 
'bofilters.move_down: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] does not exist<br />'."\r\n"; }
                                return False;
                        }
                        elseif($found_filter_num == 
(count($this->all_filters)-1))
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.move_down: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] can not be moved 
down<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo 
'bofilters.move_down: LEAVING with error, filter $found_filter_num 
[<code>'.serialize($found_filter_num).'</code>] can not be moved down<br 
/>'."\r\n"; }
                                return False;
                        }
                        // if we get here we need to move up this filter
@@ -399,7 +399,7 @@
                        $take_me_to_url = $GLOBALS['phpgw']->link(
                                                                                
'/index.php',
                                                                                
'menuaction=email.uifilters.filters_list');
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.move_down: LEAVING with redirect to: <br>'.$take_me_to_url.'<br>'; }
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.move_down: LEAVING with redirect to: <br />'.$take_me_to_url.'<br 
/>'; }
                        Header('Location: ' . $take_me_to_url);
                }
                
@@ -418,22 +418,22 @@
                */
                function all_filters_bulk_undo_defang()
                {
-                       if ($this->debug > 0) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): ENTERING<br>'."\r\n"; } 
+                       if ($this->debug > 0) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): ENTERING<br />'."\r\n"; 
} 
                        $did_decode = False;
                        if (!$this->all_filters)
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): LEAVING early, nothing 
to process, $this->all_filters is empty, returning $did_decode 
['.serialize($did_decode).']<br>'."\r\n"; } 
+                               if ($this->debug > 0) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): LEAVING early, nothing 
to process, $this->all_filters is empty, returning $did_decode 
['.serialize($did_decode).']<br />'."\r\n"; } 
                                return $did_decode;
                        }
                        // UNDO the DATABASE DEFANG, 
-                       if ($this->debug > 1) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): about to UNDO the pref 
friendly defanged chars, so the the html encoding of certain offending chars 
prefs is UNDONE here<br>'."\r\n"; }
+                       if ($this->debug > 1) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): about to UNDO the pref 
friendly defanged chars, so the the html encoding of certain offending chars 
prefs is UNDONE here<br />'."\r\n"; }
                        $did_decode = False;
                        for ($filter_idx=0; $filter_idx < 
count($this->all_filters); $filter_idx++)
                        {
                                // currently only 2 elements get the defang, 
undefang treatment
                                // 1. filtername
                                $refanged_filtername = 
$this->string_undo_defang($this->all_filters[$filter_idx]['filtername']);
-                               if ($this->debug > 1) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): still defanged 
$this->all_filters['.$filter_idx.'][filtername] is 
['.serialize($this->all_filters[$filter_idx]['filtername']).'], RE-fanged 
$refanged_filtername ['.serialize($refanged_filtername).']<br>'."\r\n"; } 
+                               if ($this->debug > 1) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): still defanged 
$this->all_filters['.$filter_idx.'][filtername] is 
['.serialize($this->all_filters[$filter_idx]['filtername']).'], RE-fanged 
$refanged_filtername ['.serialize($refanged_filtername).']<br />'."\r\n"; } 
                                if ($refanged_filtername != 
$this->all_filters[$filter_idx]['filtername'])
                                {
                                        $did_decode = True;
@@ -443,7 +443,7 @@
                                for ($matches_idx=0; $matches_idx < 
count($this->all_filters[$filter_idx]['matches']); $matches_idx++)
                                {
                                        $refanged_matchthis = 
$this->string_undo_defang($this->all_filters[$filter_idx]['matches'][$matches_idx]['matchthis']);
-                                       if ($this->debug > 1) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): still defanged 
$this->all_filters['.$filter_idx.'][matches]['.$matches_idx.'][matchthis] is 
['.serialize($this->all_filters[$filter_idx]['matches'][$matches_idx]['matchthis']).'],
 RE-fanged $refanged_matchthis 
['.serialize($refanged_matchthis).']<br>'."\r\n"; }
+                                       if ($this->debug > 1) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): still defanged 
$this->all_filters['.$filter_idx.'][matches]['.$matches_idx.'][matchthis] is 
['.serialize($this->all_filters[$filter_idx]['matches'][$matches_idx]['matchthis']).'],
 RE-fanged $refanged_matchthis ['.serialize($refanged_matchthis).']<br 
/>'."\r\n"; }
                                        if ($refanged_matchthis != 
$this->all_filters[$filter_idx]['matches'][$matches_idx]['matchthis'])
                                        {
                                                $did_decode = True;
@@ -452,7 +452,7 @@
                                }
                        }
                        if ($this->debug > 2) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): defanged 
$this->all_filters DUMP:<pre>'; print_r($this->all_filters); echo 
'</pre>'."\r\n"; } 
-                       if ($this->debug > 0) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): LEAVING, returning 
$did_decode ['.serialize($did_decode).']<br>'."\r\n"; } 
+                       if ($this->debug > 0) { echo 
'bofilters.all_filters_bulk_undo_defang('.__LINE__.'): LEAVING, returning 
$did_decode ['.serialize($did_decode).']<br />'."\r\n"; } 
                        return $did_decode;
                }
                
@@ -463,7 +463,7 @@
                */
                function string_undo_defang($pref_string='')
                {
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_undo_defang('.__LINE__.'): ENTERING, param $pref_string 
['.serialize($pref_string).']<br>'."\r\n"; } 
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_undo_defang('.__LINE__.'): ENTERING, param $pref_string 
['.serialize($pref_string).']<br />'."\r\n"; } 
                        if (!$pref_string)
                        {
                                return '';
@@ -471,7 +471,7 @@
                        // undo the _LAME_ way to make the value "database 
friendly"
                        // return slashes and quotes to their actual form as 
slashes and quotes
                        $un_defanged_string = 
$GLOBALS['phpgw']->msg->html_quotes_decode($pref_string);
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_undo_defang('.__LINE__.'): LEAVING returning 
$un_defanged_string ['.serialize($un_defanged_string).']<br>'."\r\n"; } 
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_undo_defang('.__LINE__.'): LEAVING returning 
$un_defanged_string ['.serialize($un_defanged_string).']<br />'."\r\n"; } 
                        return $un_defanged_string;
                }
                
@@ -488,7 +488,7 @@
                */
                function string_strip_and_defang($user_string='')
                {
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_strip_and_defang: ENTERING, para, $user_string 
['.serialize($user_string).']<br>'."\r\n"; } 
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_strip_and_defang: ENTERING, para, $user_string 
['.serialize($user_string).']<br />'."\r\n"; } 
                        if (!$user_string)
                        {
                                return '';
@@ -499,7 +499,7 @@
                        // and this is a _LAME_ way to make the value "database 
friendly"
                        // because slashes and quotes will FRY the whole 
preferences repository
                        $prepared_string = 
$GLOBALS['phpgw']->msg->html_quotes_encode($prepared_string);
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_strip_and_defang: LEAVING returning $prepared_string 
['.serialize($prepared_string).']<br>'."\r\n"; } 
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.string_strip_and_defang: LEAVING returning $prepared_string 
['.serialize($prepared_string).']<br />'."\r\n"; } 
                        return $prepared_string;
                }
                
@@ -515,8 +515,8 @@
                */
                function check_duplicate_submit_elements($key='source_accounts')
                {
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.check_duplicate_submit_elements('.__LINE__.'): ENTERING, param $key 
is ['.$key.'] <br>'."\r\n"; } 
-                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.check_duplicate_submit_elements('.__LINE__.'): this checks for buggy 
apache2 duplicated source account POSTED form numbered array data<br>'."\r\n"; 
} 
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.check_duplicate_submit_elements('.__LINE__.'): ENTERING, param $key 
is ['.$key.'] <br />'."\r\n"; } 
+                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.check_duplicate_submit_elements('.__LINE__.'): this checks for buggy 
apache2 duplicated source account POSTED form numbered array data<br 
/>'."\r\n"; } 
                        $did_alter = False;
                        
                        //source_accounts
@@ -528,7 +528,7 @@
                                if 
(in_array($GLOBALS['phpgw']->msg->ref_POST[$key][$i], $seen_list_items) == True)
                                {
                                        $did_alter = True;
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters: check_duplicate_submit_elements('.__LINE__.'): <u>unsetting</u> and 
*skipping* duplicate (buggy apache2) POST ['.$key.']['.$i.'] array item 
['.$GLOBALS['phpgw']->msg->ref_POST[$key][$i].'] <br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters: check_duplicate_submit_elements('.__LINE__.'): <u>unsetting</u> and 
*skipping* duplicate (buggy apache2) POST ['.$key.']['.$i.'] array item 
['.$GLOBALS['phpgw']->msg->ref_POST[$key][$i].'] <br />'; }
                                        
$GLOBALS['phpgw']->msg->ref_POST[$key][$i] = '';
                                        // can I UNSET this and have the next 
$i index item actually be the next one
                                        // YES, a) array count calculated 
before loop, and b) does not squash array to unset an item
@@ -542,13 +542,13 @@
                                else
                                {
                                        // track seen items for duplicate test
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters: check_duplicate_submit_elements('.__LINE__.'): good (not duplicate, 
not buggy apache2) POST ['.$key.']['.$i.'] array item 
['.$GLOBALS['phpgw']->msg->ref_POST[$key][$i].'] <br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters: check_duplicate_submit_elements('.__LINE__.'): good (not duplicate, 
not buggy apache2) POST ['.$key.']['.$i.'] array item 
['.$GLOBALS['phpgw']->msg->ref_POST[$key][$i].'] <br />'; }
                                        $tmp_next_idx = count($seen_list_items);
                                        $seen_list_items[$tmp_next_idx] = 
$GLOBALS['phpgw']->msg->ref_POST[$key][$i];
                                }
                        }
                        
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.check_duplicate_submit_elements('.__LINE__.'): LEAVING, returning 
$did_alter ['.serialize($did_alter).']<br>'."\r\n"; } 
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.check_duplicate_submit_elements('.__LINE__.'): LEAVING, returning 
$did_alter ['.serialize($did_alter).']<br />'."\r\n"; } 
                }
                
                /*!
@@ -558,11 +558,11 @@
                */
                function process_submitted_data()
                {
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.process_submitted_data('.__LINE__.'): ENTERING<br>'."\r\n"; }
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.process_submitted_data('.__LINE__.'): ENTERING<br />'."\r\n"; }
                        if ($this->debug_set_prefs > 2) { echo 
'bofilters.process_submitted_data('.__LINE__.'): (pre-buggy apache2 check) 
ref_POST dump:<pre>'; print_r($GLOBALS['phpgw']->msg->ref_POST); echo 
'</pre>'."\r\n"; }
                        
$this->check_duplicate_submit_elements('source_accounts');
                        
-                       //if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data: caling 
$this->distill_filter_args<br>'."\r\n"; }
+                       //if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data: caling $this->distill_filter_args<br 
/>'."\r\n"; }
                        //$this->distill_filter_args();
                        // we must have data because the form action made this 
code run
                        $this_filter = array();
@@ -577,7 +577,7 @@
                                echo 
'bofilters.process_submitted_data('.__LINE__.'): LEAVING with ERROR, unable to 
obtain POST filter_num';
                                return;
                        }
-                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): $this_filter[filter_num]: 
['.$found_filter_num.']<br>'; }
+                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): $this_filter[filter_num]: 
['.$found_filter_num.']<br />'; }
                        
                        // FILTER NAME
                        if 
((isset($GLOBALS['phpgw']->msg->ref_POST['filtername']))
@@ -592,7 +592,7 @@
                                //$this_filter['filtername'] = 'Filter 
'.$found_filter_num;
                                $this_filter['filtername'] = 'My Mail Filter';
                        }
-                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): $this_filter[filtername]: 
['.$this_filter['filtername'].']<br>'; }
+                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): $this_filter[filtername]: 
['.$this_filter['filtername'].']<br />'; }
                        
                        // ---- The Rest of the data is submitted in  Array 
Form ----
                        
@@ -632,7 +632,7 @@
                                || ($key == 'filtername')
                                || ($key == 'source_accounts'))
                                {
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): $GLOBALS[HTTP_POST_VARS] 
key,value walk thru: $key: ['.$key.'] is data we already processed, skip to 
next loop<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): $GLOBALS[HTTP_POST_VARS] 
key,value walk thru: $key: ['.$key.'] is data we already processed, skip to 
next loop<br />'; }
                                        continue;
                                }
                                if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): $GLOBALS[HTTP_POST_VARS] 
key,value walk thru: $key: ['.$key.'] ; $value DUMP:<pre>'; print_r($value); 
echo "</pre>\r\n"; }
@@ -641,39 +641,39 @@
                                {
                                        // now we grab the index value from the 
key string
                                        $match_this_idx = (int)$key[6];
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): match_this_idx grabbed value: 
['.$match_this_idx.']<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): match_this_idx grabbed value: 
['.$match_this_idx.']<br />'; }
                                        $match_data = 
$GLOBALS['phpgw']->msg->ref_POST[$key];
                                        // is this row even being used?
                                        if ((isset($match_data['andor']))
                                        && ($match_data['andor'] == 
'ignore_me'))
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): SKIP this row, 
$match_data[andor]: ['.$match_data['andor'].']<br>'; }
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): SKIP this row, 
$match_data[andor]: ['.$match_data['andor'].']<br />'; }
                                        }
                                        else
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): $match_data[matchthis] 
PRE-defang ['.serialize($match_data['matchthis']).']<br>'; } 
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): $match_data[matchthis] 
PRE-defang ['.serialize($match_data['matchthis']).']<br />'; } 
                                                // DEFANG on 
$match_data["matchthis"] (will need to reverse that on read) 
                                                $match_data['matchthis'] = 
$this->string_strip_and_defang($match_data['matchthis']);
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): $match_data[matchthis] 
POST-defang ['.serialize($match_data['matchthis']).']<br>'; } 
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): $match_data[matchthis] 
POST-defang ['.serialize($match_data['matchthis']).']<br />'; } 
                                                
$this_filter['matches'][$match_this_idx] = $match_data;
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): 
$this_filter[matches]['.$match_this_idx.'] = 
['.serialize($this_filter['matches'][$match_this_idx]).']<br>'; }
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): 
$this_filter[matches]['.$match_this_idx.'] = 
['.serialize($this_filter['matches'][$match_this_idx]).']<br />'; }
                                        }
                                }
                                elseif (strstr($key, 'action_'))
                                {
                                        // now we grab the index value from the 
key string
                                        $action_this_idx = (int)$key[7];
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): action_this_idx grabbed value: 
['.$action_this_idx.']<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.process_submitted_data('.__LINE__.'): action_this_idx grabbed value: 
['.$action_this_idx.']<br />'; }
                                        $action_data = 
$GLOBALS['phpgw']->msg->ref_POST[$key];
                                        if ((isset($action_data['judgement']))
                                        && ($action_data['judgement'] == 
'ignore_me'))
                                        {
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): SKIP this row, 
$action_data[judgement]: ['.$match_data['andor'].']<br>'; }
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): SKIP this row, 
$action_data[judgement]: ['.$match_data['andor'].']<br />'; }
                                        }
                                        else
                                        {
                                                
$this_filter['actions'][$action_this_idx] = $action_data;
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): 
$this_filter[actions][$action_this_idx]: 
['.serialize($this_filter['actions'][$action_this_idx]).']<br>'; }
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.process_submitted_data('.__LINE__.'): 
$this_filter[actions][$action_this_idx]: 
['.serialize($this_filter['actions'][$action_this_idx]).']<br />'; }
                                        }
                                }
                        }
@@ -724,12 +724,12 @@
 
                        // NEW we need to wipe the cached filters
                        $my_location = '0;cached_prefs';
-                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository('.__LINE__.'): NEW: EXPIRE CACHED 
PREFERENCES, calling ->msg->so->so_appsession_passthru('.$my_location.', " 
")<br>'; }
+                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository('.__LINE__.'): NEW: EXPIRE CACHED 
PREFERENCES, calling ->msg->so->so_appsession_passthru('.$my_location.', " 
")<br />'; }
                        
$GLOBALS['phpgw']->msg->so->so_appsession_passthru($my_location, ' ');
                        
                        // first we delete any existing data at the desired 
prefs location
                        $pref_struct_str = '["filters"]';
-                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->delete_struct("email", $pref_struct_str) which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                        
$GLOBALS['phpgw']->preferences->delete_struct('email',$pref_struct_str);
                        
                        for ($filter_idx=0; $filter_idx < 
count($this->all_filters); $filter_idx++)
@@ -742,7 +742,7 @@
                                
                                // $this_filter['filtername']   string (will 
require htmlslecialchars_encode and decode
                                $pref_struct_str = 
'["filters"]['.$filter_idx.']["filtername"]';
-                               if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['filtername'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                               if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['filtername'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['filtername']);
                                
                                // $this_filter['source_accounts']      array
@@ -753,11 +753,11 @@
                                {
                                        // folder
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["source_accounts"]['.$i.']["folder"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['source_accounts'][$i]['folder'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['source_accounts'][$i]['folder'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['source_accounts'][$i]['folder']);
                                        // acctnum
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["source_accounts"]['.$i.']["acctnum"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['source_accounts'][$i]['acctnum'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['source_accounts'][$i]['acctnum'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['source_accounts'][$i]['acctnum']);
                                }
                                
@@ -773,16 +773,16 @@
                                        if 
(isset($this_filter['matches'][$i]['andor']))
                                        {
                                                $pref_struct_str = 
'["filters"]['.$filter_idx.']["matches"]['.$i.']["andor"]';
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['andor'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['andor'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                                
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['matches'][$i]['andor']);
                                        }
                                        // examine
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["matches"]['.$i.']["examine"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['examine'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['examine'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['matches'][$i]['examine']);
                                        // comparator
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["matches"]['.$i.']["comparator"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['comparator'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['comparator'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['matches'][$i]['comparator']);
                                        // matchthis
                                        // user_string, may need 
htmlslecialchars_encode decode and/or the user may forget to tnter data here
@@ -792,7 +792,7 @@
                                                
$this_filter['matches'][$i]['matchthis'] = 'user_string_not_filled_by_user';
                                        }
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["matches"]['.$i.']["matchthis"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['matchthis'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['matches'][$i]['matchthis'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['matches'][$i]['matchthis']);
                                }
                                
@@ -806,21 +806,21 @@
                                {
                                        // judgement
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["actions"]['.$i.']["judgement"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['judgement'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['judgement'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['actions'][$i]['judgement']);
                                        // folder
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["actions"]['.$i.']["folder"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['folder'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['folder'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['actions'][$i]['folder']);
                                        // actiontext
                                        $pref_struct_str = 
'["filters"]['.$filter_idx.']["actions"]['.$i.']["actiontext"]';
-                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['actiontext'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                       if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['actiontext'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                        
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['actions'][$i]['actiontext']);
                                        // stop_filtering
                                        if 
(isset($this_filter['actions'][$i]['stop_filtering']))
                                        {
                                                $pref_struct_str = 
'["filters"]['.$filter_idx.']["actions"]['.$i.']["stop_filtering"]';
-                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['stop_filtering'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br>'; }
+                                               if ($this->debug_set_prefs > 1) 
{ echo 'bofilters.save_all_filters_to_repository: using 
preferences->add_struct("email", $pref_struct_str, 
'.$this_filter['actions'][$i]['stop_filtering'].') which will eval 
$pref_struct_str='.$pref_struct_str.'<br />'; }
                                                
$GLOBALS['phpgw']->preferences->add_struct('email', $pref_struct_str, 
$this_filter['actions'][$i]['stop_filtering']);
                                        }
                                }
@@ -829,12 +829,12 @@
                        // DONE processing prefs, SAVE to the Repository
                        if ($this->debug_set_prefs > 3) 
                        {
-                               echo 'bofilters.save_all_filters_to_repository: 
*debug* at ['.$this->debug_set_prefs.'] so skipping save_repository<br>';
+                               echo 'bofilters.save_all_filters_to_repository: 
*debug* at ['.$this->debug_set_prefs.'] so skipping save_repository<br />';
                        }
                        else
                        {
                                if ($this->debug_set_prefs > 2) { echo 
'bofilters.save_all_filters_to_repository: direct pre-save 
$GLOBALS[phpgw]->preferences->data[email][filters] DUMP:<pre>'; 
print_r($GLOBALS['phpgw']->preferences->data['email']['filters']); echo 
'</pre>'; }
-                               if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: SAVING REPOSITORY<br>'; }
+                               if ($this->debug_set_prefs > 1) { echo 
'bofilters.save_all_filters_to_repository: SAVING REPOSITORY<br />'; }
                                
$GLOBALS['phpgw']->preferences->save_repository();
                                // re-grab data from prefs
                                
@@ -847,14 +847,14 @@
                                                                                
'/index.php',
                                                                                
'menuaction=email.uifilters.filters_list');
                        
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.save_all_filters_to_repository: almost LEAVING, about to issue a 
redirect to:<br>'.$take_me_to_url.'<br>'; }
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.save_all_filters_to_repository: almost LEAVING, about to issue a 
redirect to:<br />'.$take_me_to_url.'<br />'; }
                        if ($this->debug_set_prefs > 1) 
                        {
-                               echo 'bofilters.save_all_filters_to_repository: 
LEAVING, *debug* at ['.$this->debug_set_prefs.'] so skipping Header redirection 
to: ['.$take_me_to_url.']<br>';
+                               echo 'bofilters.save_all_filters_to_repository: 
LEAVING, *debug* at ['.$this->debug_set_prefs.'] so skipping Header redirection 
to: ['.$take_me_to_url.']<br />';
                        }
                        else
                        {
-                               if ($this->debug_set_prefs > 0) { echo 
'bofilters.save_all_filters_to_repository: LEAVING with redirect to: 
<br>'.$take_me_to_url.'<br>'; }
+                               if ($this->debug_set_prefs > 0) { echo 
'bofilters.save_all_filters_to_repository: LEAVING with redirect to: <br 
/>'.$take_me_to_url.'<br />'; }
                                Header('Location: ' . $take_me_to_url);
                        }
                }
@@ -866,7 +866,7 @@
                */
                function delete_filter()
                {
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.delete_filter: ENTERING<br>'; }
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.delete_filter: ENTERING<br />'; }
                        // FILTER NUMBER
                        $filter_num = $this->obtain_filer_num();
                        
@@ -880,7 +880,7 @@
                        $this->all_filters[$filter_num] = array();
                        unset($this->all_filters[$filter_num]);
                        $this->save_all_filters_to_repository();
-                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.delete_filter: LEAVING<br>'; }
+                       if ($this->debug_set_prefs > 0) { echo 
'bofilters.delete_filter: LEAVING<br />'; }
                }
                
                
@@ -891,24 +891,24 @@
                */
                function do_filter()
                {
-                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): ENTERING<br>'; }
+                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): ENTERING<br />'; }
                        if (count($this->all_filters) == 0)
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): LEAVING with ERROR, no filters exist<br>'; 
} 
+                               if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): LEAVING with ERROR, no filters exist<br 
/>'; } 
                                return False;
                        }
                        
-                       //if ($this->debug > 0) { echo 'bofilters.do_filter: 
LINE '.__LINE__.' call "->msg->event_begin_big_move" to notice event of 
impending big batch moves or deletes<br>'; }
+                       //if ($this->debug > 0) { echo 'bofilters.do_filter: 
LINE '.__LINE__.' call "->msg->event_begin_big_move" to notice event of 
impending big batch moves or deletes<br />'; }
                        // CORRECTION: the move function now buffers the 
commands and the count of those buffered commands is kept there, where big move 
or not is now determined 
                        //$GLOBALS['phpgw']->msg->event_begin_big_move(array(), 
'bofilters.do_filter: LINE '.__LINE__);
                        
                        // filtering thousands of messages can require more time
-                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): calling set_time_limit giving value of 120 
ie 2 minutes? <br>'; } 
+                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): calling set_time_limit giving value of 120 
ie 2 minutes? <br />'; } 
                        set_time_limit(120);
                        
                        // "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.do_filter('.__LINE__.'): $found_filter_num : 
[<code>'.serialize($found_filter_num).'</code>]<br>'."\r\n"; }
+                       if ($this->debug > 1) { echo 
'bofilters.do_filter('.__LINE__.'): $found_filter_num : 
[<code>'.serialize($found_filter_num).'</code>]<br />'."\r\n"; }
                        
                        if ($found_filter_num == $this->not_set)
                        {
@@ -916,7 +916,7 @@
                                $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('.__LINE__.'): run_all_finters_mode: calling 
$this->run_single_filter['.$filter_idx.']<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.do_filter('.__LINE__.'): run_all_finters_mode: calling 
$this->run_single_filter['.$filter_idx.']<br />'; }
                                        
$this->run_single_filter((int)$filter_idx);
                                        if ($this->just_testing())
                                        {
@@ -929,7 +929,7 @@
                        {
                                // 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('.__LINE__.'): run_single_filter mode: calling 
$this->run_single_filter['.$found_filter_num.']<br>'; }
+                               if ($this->debug > 1) { echo 
'bofilters.do_filter('.__LINE__.'): run_single_filter mode: calling 
$this->run_single_filter['.$found_filter_num.']<br />'; }
                                
$this->run_single_filter((int)$found_filter_num);
                                if ($this->just_testing())
                                {
@@ -939,10 +939,10 @@
                        }
                        
                        // ok, filters have run, EXPUNGE now
-                       if ($this->debug > 1) { echo 'bofilters.do_filter 
('.__LINE__.'): done filtering, now call 
$GLOBALS[phpgw]->msg->expunge_expungable_folders<br>'; }
+                       if ($this->debug > 1) { echo 'bofilters.do_filter 
('.__LINE__.'): done filtering, now call 
$GLOBALS[phpgw]->msg->expunge_expungable_folders<br />'; }
                        $did_expunge = False;
                        $did_expunge = 
$GLOBALS['phpgw']->msg->expunge_expungable_folders('bofilters.do_filter LINE 
'.__LINE__);
-                       if ($this->debug > 1) { echo 'bofilters.do_filter 
('.__LINE__.'): $GLOBALS[phpgw]->msg->expunge_expungable_folders() returns 
['.serialize($did_expunge).']<br>'; }
+                       if ($this->debug > 1) { echo 'bofilters.do_filter 
('.__LINE__.'): $GLOBALS[phpgw]->msg->expunge_expungable_folders() returns 
['.serialize($did_expunge).']<br />'; }
                        
                        // ok, filters have run, do we have a report to show?
                        if ($this->just_testing())
@@ -972,27 +972,27 @@
                                        $num_matches = 
count($this->each_filter_mball_list[$filter_idx]);
                                        
parse_str($this_filter['actions'][0]['folder'], $target_folder);
                                        echo '<p>'."\r\n"
-                                       .'<strong>'.lang('Filter number').' 
'.(string)$filter_idx.':</strong>'.'<br>'."\r\n"
-                                       .'&nbsp;&nbsp;&nbsp;'.lang('filter 
name:').' ['.$this_filter['filtername'].']<br>'."\r\n"
-                                       .'&nbsp;&nbsp;&nbsp;'.lang('number of 
matches:').' ['.(string)$num_matches.']'.'<br>'."\r\n"
+                                       .'<strong>'.lang('Filter number').' 
'.(string)$filter_idx.':</strong>'.'<br />'."\r\n"
+                                       .'&nbsp;&nbsp;&nbsp;'.lang('filter 
name:').' ['.$this_filter['filtername'].']<br />'."\r\n"
+                                       .'&nbsp;&nbsp;&nbsp;'.lang('number of 
matches:').' ['.(string)$num_matches.']'.'<br />'."\r\n"
 
-                                       .'&nbsp;&nbsp;&nbsp;'.lang('requested 
filter action:').' ['.$this_filter['actions'][0]['judgement'].'] ; Acctnum 
['.(string)$target_folder['acctnum'].'] ;  '.lang('Folder').': 
['.htmlspecialchars($target_folder['folder']).']<br>'."\r\n"
+                                       .'&nbsp;&nbsp;&nbsp;'.lang('requested 
filter action:').' ['.$this_filter['actions'][0]['judgement'].'] ; Acctnum 
['.(string)$target_folder['acctnum'].'] ;  '.lang('Folder').': 
['.htmlspecialchars($target_folder['folder']).']<br />'."\r\n"
                                        .'</p>'."\r\n"
                                        .'<p>&nbsp;</p>'."\r\n";
                                }
                        }
-                       if ($this->debug > 1) { echo 
'bofilters.do_filter('.__LINE__.'): calling end_request<br>'; }
+                       if ($this->debug > 1) { echo 
'bofilters.do_filter('.__LINE__.'): calling end_request<br />'; }
                        $GLOBALS['phpgw']->msg->end_request();
-                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): LEAVING<br>'; }
+                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): LEAVING<br />'; }
                        $take_me_to_url = $GLOBALS['phpgw']->link(
                                                                                
'/index.php',
                                                                                
//'menuaction=email.uifilters.filters_list');
                                                                                
'menuaction=email.uiindex.index');
                        $take_me_to_href = '<a href="'.$take_me_to_url.'"> 
'.lang('Go Back').' </a>';
                        //Header('Location: ' . $take_me_to_url);
-                       echo 
'<br><p>'.'&nbsp;&nbsp;&nbsp;'.$take_me_to_href.'</p><BR>';
+                       echo '<br 
/><p>'.'&nbsp;&nbsp;&nbsp;'.$take_me_to_href.'</p><br />';
 
-                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): LEAVING<br>'; }
+                       if ($this->debug > 0) { echo 
'bofilters.do_filter('.__LINE__.'): LEAVING<br />'; }
                }
                
                // PRIVATE
@@ -1004,15 +1004,15 @@
                */
                function run_single_filter($filter_num='')
                {
-                       if ($this->debug > 0) { echo 
'bofilters.run_single_filter('.__LINE__.'): ENTERING, feed  $filter_num : 
[<code>'.serialize($filter_num).'</code>]<br>'; }
+                       if ($this->debug > 0) { echo 
'bofilters.run_single_filter('.__LINE__.'): 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('.__LINE__.'): LEAVING with ERROR, no filters 
exist<br>'; }
+                               if ($this->debug > 0) { echo 
'bofilters.run_single_filter('.__LINE__.'): LEAVING with ERROR, no filters 
exist<br />'; }
                        }
                        $filter_exists = $this->filter_exists($filter_num);
                        if (!$filter_exists)
                        {
-                               if ($this->debug > 0) { echo 
'bofilters.run_single_filter('.__LINE__.'): LEAVING with ERROR, filter data for 
$filter_num ['.$filter_num.'] does not exist, return False<br>'; }
+                               if ($this->debug > 0) { echo 
'bofilters.run_single_filter('.__LINE__.'): LEAVING with ERROR, filter data for 
$filter_num ['.$filter_num.'] does not exist, return False<br />'; }
                                return False;
                        }
                        $this_filter = $this->all_filters[$filter_num];
@@ -1021,7 +1021,7 @@
                        // WE NEED TO DO THIS FOR EVERY SOURCE ACCOUNT 
specified in this filter
                        for ($src_acct_loop_num=0; $src_acct_loop_num < 
count($this_filter['source_accounts']); $src_acct_loop_num++)
                        {
-                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): source_accounts loop 
['.$src_acct_loop_num.']<br>'; }
+                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): source_accounts loop 
['.$src_acct_loop_num.']<br />'; }
                                
                                // ACCOUNT TO SEARCH (always filter source is 
INBOX)
                                $fake_fldball = array();
@@ -1033,12 +1033,12 @@
                                if 
((isset($this->inbox_full_msgball_list[$src_acct_loop_num]))
                                || 
(count($this->inbox_full_msgball_list[$src_acct_loop_num]) > 0))
                                {
-                                       if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): already obtained 
inbox_full_msgball_list, during a previous filter, for $src_acct_loop_num 
['.$src_acct_loop_num.']<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): already obtained 
inbox_full_msgball_list, during a previous filter, for $src_acct_loop_num 
['.$src_acct_loop_num.']<br />'; }
                                }
                                else
                                {
                                        // get FULL msgball list for this INBOX 
(we always filter INBOXs only)
-                                       if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): get_msgball_list for later XOR ing 
for <code>['.serialize($fake_fldball).']</code><br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): get_msgball_list for later XOR ing 
for <code>['.serialize($fake_fldball).']</code><br />'; }
                                        
//$this->inbox_full_msgball_list[$src_acct_loop_num] = 
$GLOBALS['phpgw']->msg->get_msgball_list($fake_fldball['acctnum'], 
$fake_fldball['folder']);
                                        // FIXME: FOR BACKWARDS COMPAT WE GET 
AN OLD STYLE MSGBALL LIST
                                        
$this->inbox_full_msgball_list[$src_acct_loop_num] = 
$GLOBALS['phpgw']->msg->get_msgball_list_oldschool($fake_fldball['acctnum'], 
$fake_fldball['folder']);
@@ -1047,7 +1047,7 @@
                                
                                // FOR EACH MSG, GET IT'S RAW HEADERS
                                // only if we have not got them yet
-                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): get headers for each msg in 
$src_acct_loop_num ['.$src_acct_loop_num.']<br>'; }
+                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): get headers for each msg in 
$src_acct_loop_num ['.$src_acct_loop_num.']<br />'; }
                                for ($msg_iteration=0; $msg_iteration < 
count($this->inbox_full_msgball_list[$src_acct_loop_num]); $msg_iteration++)
                                {
                                        if 
((isset($this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['headers_text']))
@@ -1055,7 +1055,7 @@
                                        {
                                                // we ALREADY hav the headers
                                                // continue to the next message
-                                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): already obtained headers, during a 
previous filter, for $src_acct_loop_num ['.$src_acct_loop_num.']<br>'; }
+                                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): already obtained headers, during a 
previous filter, for $src_acct_loop_num ['.$src_acct_loop_num.']<br />'; }
                                                continue;
                                        }
                                        // we need to get the headers
@@ -1130,7 +1130,7 @@
                                        if 
($this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['msgnum'] 
== $this->not_set)
                                        {
                                                // this message had already 
been filtered AND MOVED OR DELETED, continue to next loop
-                                               if ($this->debug > 1) { echo 
'<br>bofilters.run_single_filter('.__LINE__.'): skipping... this message has 
already been moved, deleted by a previous filter, $src_acct_loop_num 
['.$src_acct_loop_num.'] $msg_iteration ['.$msg_iteration.']<br><br>'; }
+                                               if ($this->debug > 1) { echo 
'<br />bofilters.run_single_filter('.__LINE__.'): skipping... this message has 
already been moved, deleted by a previous filter, $src_acct_loop_num 
['.$src_acct_loop_num.'] $msg_iteration ['.$msg_iteration.']<br /><br />'; }
                                                continue;
                                        }
                                        // we have a message to be filtered...
@@ -1143,7 +1143,7 @@
                                        // WE NEED TO DO THIS FOR EVERY MATCH 
ROW
                                        for ($matches_row=0; $matches_row < 
count($this_filter['matches']); $matches_row++)
                                        {
-                                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): source_accounts loop 
['.$src_acct_loop_num.'] ; $msg_iteration ['.$msg_iteration.'] ; $matches_row 
['.$matches_row.']<br>'; }
+                                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): source_accounts loop 
['.$src_acct_loop_num.'] ; $msg_iteration ['.$msg_iteration.'] ; $matches_row 
['.$matches_row.']<br />'; }
                                                // Note on "RECIPIENT" :  
to,cc, bcc  "tri-fecta" all three headers must be considered
                                                // this is why we made a faux 
header line that contains all three of those in one line
                                                // NOTE: recipient Contains vs. 
NotContains
@@ -1165,7 +1165,7 @@
                                                // if this is really the 1st 
word of the header string, it will be preceeded by CRLF
                                                $inspect_me = 
stristr($headers_text, "\r\n".$search_key_imap);
                                                // inspect_me will be 
everything to the right of the "neede" INCLUDING the "needle" itself and the 
REST of the headers
-                                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): $search_key_imap  
['.$search_key_imap.'] ; $comparator ['.$comparator.'] ; $search_for 
['.$search_for.']<br>'; }
+                                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter('.__LINE__.'): $search_key_imap  
['.$search_key_imap.'] ; $comparator ['.$comparator.'] ; $search_for 
['.$search_for.']<br />'; }
                                                if ($inspect_me)
                                                {
                                                        // get rid of that 
"needle"  search_key_imap (it's included from the stristr above)
@@ -1176,7 +1176,7 @@
                                                        $cut_here = 
strpos($inspect_me, "\r\n");
                                                        // get everything FROM 
beginning of string TO  pos $cut_here (the end of the line);
                                                        $inspect_me = 
substr($inspect_me, 0, $cut_here);
-                                                       if ($this->debug > 1) { 
echo 'bofilters.run_single_filter('.__LINE__.'): GOT HEADER TO LOOK IN: 
$inspect_me ['.htmlspecialchars($inspect_me).']<br>'; }
+                                                       if ($this->debug > 1) { 
echo 'bofilters.run_single_filter('.__LINE__.'): GOT HEADER TO LOOK IN: 
$inspect_me ['.htmlspecialchars($inspect_me).']<br />'; }
                                                        // look for EXISTS or 
NOT EXISTS our search string
                                                        if
                                                        (
@@ -1186,7 +1186,7 @@
                                                                && 
(stristr($inspect_me, $search_for) == False))
                                                        )
                                                        {
-                                                               if 
($this->debug > 1) { echo 'bofilters.run_single_filter('.__LINE__.'): ** GOT 
ROW CRITERIA MATCH ** $matches_row '.$matches_row.'<br>'; }
+                                                               if 
($this->debug > 1) { echo 'bofilters.run_single_filter('.__LINE__.'): ** GOT 
ROW CRITERIA MATCH ** $matches_row '.$matches_row.'<br />'; }
                                                                // MATCH: this 
row matches the search criteria
                                                                // i.e. this 
header line does -or- does not have the seach for text, as requested
                                                                if 
($matches_row == 0)
@@ -1207,7 +1207,7 @@
                                                                }
                                                                else
                                                                {
-                                                                       echo 
'match keeper error<br>';
+                                                                       echo 
'match keeper error<br />';
                                                                        
$this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['match_keeper']
 = 'ERROR1';
                                                                }
                                                                
@@ -1221,7 +1221,7 @@
                                                {
                                                        // header we are 
looking for does not exist in this messages headers
                                                        // probably lookinf for 
an "X-" header, like "X-Mailer:"
-                                                       if ($this->debug > 1) { 
echo 'bofilters.run_single_filter('.__LINE__.'): requested header 
$search_key_imap  ['.$search_key_imap.'] not in this messages headers<br>'; }
+                                                       if ($this->debug > 1) { 
echo 'bofilters.run_single_filter('.__LINE__.'): requested header 
$search_key_imap  ['.$search_key_imap.'] not in this messages headers<br />'; }
                                                }
                                                // this is the last code that 
gets run BEFORE we move on to the next row of match criteria 
                                                // this code is INSIDE the 
match criteria rows
@@ -1291,25 +1291,25 @@
                */
                function filter_action_sequence($filter_num='', 
$src_acct_loop_num='', $msg_iteration='', $this_filter='')
                {
-                       if ($this->debug > 0) { echo 
'bofilters.filter_action_sequence: ENTERING <br>'; }
+                       if ($this->debug > 0) { echo 
'bofilters.filter_action_sequence: ENTERING <br />'; }
                        if (((string)$filter_num == '')
                        || ((string)$src_acct_loop_num == '')
                        || ((string)$msg_iteration == '')
                        || ($this_filter == ''))
                        {
-                               echo 'bofilters.filter_action_sequence: 
LEAVING, insufficient data in params <br>';
+                               echo 'bofilters.filter_action_sequence: 
LEAVING, insufficient data in params <br />';
                                return False;
                        }
                        
                        $match_keeper = 
$this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['match_keeper'];
-                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: FINAL match results for this message 
[<code>'.serialize($match_keeper).'</code>] <br>'; }
+                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: FINAL match results for this message 
[<code>'.serialize($match_keeper).'</code>] <br />'; }
                        // test match keeper accuracy
                        if ($this->debug > 1)
                        { 
-                               if ($match_keeper & F_ROW_0_MATCH) { echo 
'<b>MATCH</b> row 0 criteria<br>'; }
-                               if ($match_keeper & F_ROW_1_MATCH) { echo 
'<b>MATCH</b> row 1 criteria<br>'; }
-                               if ($match_keeper & F_ROW_2_MATCH) { echo 
'<b>MATCH</b> row 2 criteria<br>'; }
-                               if ($match_keeper & F_ROW_3_MATCH) { echo 
'<b>MATCH</b> row 3 criteria<br>'; }
+                               if ($match_keeper & F_ROW_0_MATCH) { echo 
'<b>MATCH</b> row 0 criteria<br />'; }
+                               if ($match_keeper & F_ROW_1_MATCH) { echo 
'<b>MATCH</b> row 1 criteria<br />'; }
+                               if ($match_keeper & F_ROW_2_MATCH) { echo 
'<b>MATCH</b> row 2 criteria<br />'; }
+                               if ($match_keeper & F_ROW_3_MATCH) { echo 
'<b>MATCH</b> row 3 criteria<br />'; }
                        }
                        
                        $do_apply_action = False;
@@ -1319,12 +1319,12 @@
                        {
                                if ($match_keeper & F_ROW_0_MATCH)
                                {
-                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: single row criteria is a match and DOES 
trigger action<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: single row criteria is a match and DOES 
trigger action<br />'; }
                                        $do_apply_action = True;
                                }
                                else
                                {
-                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: single row criteria Fails<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: single row criteria Fails<br />'; }
                                }
                        }
                        // 2 rows handler
@@ -1336,7 +1336,7 @@
                                && ($match_keeper & F_ROW_0_MATCH)
                                && ($match_keeper & F_ROW_1_MATCH))
                                {
-                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 2 rows of criteria: "AND" logic chain is 
satisified, DO APPLY ACTION<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 2 rows of criteria: "AND" logic chain is 
satisified, DO APPLY ACTION<br />'; }
                                        $do_apply_action = True;
                                }
                                elseif (($this_filter['matches'][1]['andor'] == 
'or')
@@ -1345,12 +1345,12 @@
                                        )
                                )
                                {
-                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 2 rows of criteria: "OR" logic chain is 
satisified, DO APPLY ACTION<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 2 rows of criteria: "OR" logic chain is 
satisified, DO APPLY ACTION<br />'; }
                                        $do_apply_action = True;
                                }
                                else
                                {
-                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 2 rows of criteria: logic chain Fails<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 2 rows of criteria: logic chain Fails<br 
/>'; }
                                }
                        }
                        // 3 rows handler
@@ -1363,12 +1363,12 @@
                                        || ($match_keeper & 
$this->match_keeper_row_values[1])
                                        || ($match_keeper & 
$this->match_keeper_row_values[2]))
                                        {
-                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 3 rows of criteria: both "andor"s are "OR"s, 
logic chain is satisified, DO APPLY ACTION<br>'; }
+                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 3 rows of criteria: both "andor"s are "OR"s, 
logic chain is satisified, DO APPLY ACTION<br />'; }
                                                $do_apply_action = True;
                                        }
                                        else
                                        {
-                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 3 rows of criteria: both "andor"s are "OR"s, 
logic chain Fails<br>'; }
+                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 3 rows of criteria: both "andor"s are "OR"s, 
logic chain Fails<br />'; }
                                        }
                                }
                                // after 2 rows of match criteria, we need to 
handle more complex AND / OR logic
@@ -1400,22 +1400,22 @@
                                                        .' '.$andor_code[2].' '
                                                        .'$match_keeper & 
$this->match_keeper_row_values[2]'
                                                        .');';
-                                       if ($this->debug > 1) { echo ' * $code: 
'.$code.'<br>'; }
+                                       if ($this->debug > 1) { echo ' * $code: 
'.$code.'<br />'; }
                                        eval($code);
-                                       if ($this->debug > 1) { echo ' * 
$evaled: '.serialize($evaled).'<br>'; }
+                                       if ($this->debug > 1) { echo ' * 
$evaled: '.serialize($evaled).'<br />'; }
                                        $do_apply_action = $evaled;
                                }
                        }
                        else
                        {
-                               echo 'bofilters.filter_action_sequence: ERROR: 
too many rows<br>';
+                               echo 'bofilters.filter_action_sequence: ERROR: 
too many rows<br />';
                                return False;
                        }
                        
                        // = = = ACTION(S) = = = 
                        if ($do_apply_action == True)
                        {
-                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: <strong>### Filter MATCH ###</strong>, now 
apply the action... <br>'; }
+                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: <strong>### Filter MATCH ###</strong>, now 
apply the action... <br />'; }
                                // compile report
                                if 
(!isset($this->each_filter_mball_list[$filter_num]))
                                {
@@ -1430,7 +1430,7 @@
                                if ($this->just_testing() == False)
                                {
                                        // NOT A TEST - APPLY THE ACTION(S)
-                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: NOT a Test, *Apply* the Action(s) ; 
$this_filter[actions][0][judgement] : 
['.$this_filter['actions'][0]['judgement'].']<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: 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')
                                        {
@@ -1456,21 +1456,21 @@
                                                $to_fldball['folder'] = 
$target_folder['folder'];
                                                $to_fldball['acctnum'] = 
(int)$target_folder['acctnum'];
                                                if ($this->debug > 2) { echo 
'bofilters.filter_action_sequence: $to_fldball DUMP:<pre>'; 
print_r($to_fldball); echo "</pre>\r\n"; }
-                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: pre-move info: $mov_msgball 
[<code>'.serialize($mov_msgball).'</code>]<br>'; }
-                                               //echo 'EXIT NOT READY TO APPLY 
THE FILTER YET<br>';
+                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: pre-move info: $mov_msgball 
[<code>'.serialize($mov_msgball).'</code>]<br />'; }
+                                               //echo 'EXIT NOT READY TO APPLY 
THE FILTER YET<br />';
                                                $good_to_go = 
$GLOBALS['phpgw']->msg->industrial_interacct_mail_move($mov_msgball, 
$to_fldball);
                                                        
                                                if (!$good_to_go)
                                                {
                                                        // ERROR
-                                                       if ($this->debug > 1) { 
echo 'bofilters.filter_action_sequence: ERROR: industrial_interacct_mail_move 
returns FALSE<br>'; }
+                                                       if ($this->debug > 1) { 
echo 'bofilters.filter_action_sequence: ERROR: industrial_interacct_mail_move 
returns FALSE<br />'; }
                                                        return False;
                                                }
                                        }
                                        else
                                        {
                                                // not yet coded action
-                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: actions not yet coded: 
$this_filter[actions][0][judgement] : 
['.$this_filter['actions'][0]['judgement'].']<br>'; }
+                                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: actions not yet coded: 
$this_filter[actions][0][judgement] : 
['.$this_filter['actions'][0]['judgement'].']<br />'; }
                                        }
                                }
                                
@@ -1478,13 +1478,13 @@
                                
                                // REMOVE THIS MSGBALL from the 
"inbox_full_msgball_list" IF we move, delete, etc... the message
                                // it must remain in sync with the actual mail 
box folder
-                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: action completed, REMOVE msgball from L1 
cache class var inbox_full_msgball_list, change msgball["msgnum"] from 
'.serialize($this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['msgnum']).'
 to not_set "-1"<br>'; }
+                               if ($this->debug > 1) { echo 
'bofilters.filter_action_sequence: action completed, REMOVE msgball from L1 
cache class var inbox_full_msgball_list, change msgball["msgnum"] from 
'.serialize($this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['msgnum']).'
 to not_set "-1"<br />'; }
                                
$this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['msgnum'] = 
$this->not_set;
                        }
                        
                        
-                       if ($this->debug > 0) { echo 
'bofilters.filter_action_sequence: LEAVING, returning True <br>'; }
-                       if ($this->debug > 1) { echo '<br>'; }
+                       if ($this->debug > 0) { echo 
'bofilters.filter_action_sequence: LEAVING, returning True <br />'; }
+                       if ($this->debug > 1) { echo '<br />'; }
                        // if we get to here, no error kicked us out of this 
function, so I guess we should retuen True
                        return True;
                }
@@ -1500,8 +1500,8 @@
                        if (($this->just_testing())
                        && (count($this->each_filter_mball_list[$filter_num]) > 
0))
                        {
-                               if ($this->debug > 1) { echo 
'bofilters.make_filter_match_report: Filter Report Maker<br>'; }
-                               if ($this->debug > 1) { echo 
'bofilters.make_filter_match_report: number of matches 
$this->each_filter_mball_list['.$filter_num.'] = ' 
.count($this->each_filter_mball_list[$filter_num]).'<br>'."\r\n"; }
+                               if ($this->debug > 1) { echo 
'bofilters.make_filter_match_report: Filter Report Maker<br />'; }
+                               if ($this->debug > 1) { echo 
'bofilters.make_filter_match_report: number of matches 
$this->each_filter_mball_list['.$filter_num.'] = ' 
.count($this->each_filter_mball_list[$filter_num]).'<br />'."\r\n"; }
                                // make a "fake" folder_info array to make 
things simple for get_msg_list_display
                                $fake_folder_info['is_imap'] = True;
                                $fake_folder_info['folder_checked'] = 'INBOX';
@@ -1640,10 +1640,10 @@
                        $this_filter_matching_msgballs = array();
                        for ($src_acct_loop_num=0; $src_acct_loop_num < 
count($this_filter['source_accounts']); $src_acct_loop_num++)
                        {
-                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter: source_accounts ACTION loop 
['.$src_acct_loop_num.']<br>'; }
+                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter: source_accounts ACTION loop 
['.$src_acct_loop_num.']<br />'; }
                                for ($msg_iteration=0; $msg_iteration < 
count($this->inbox_full_msgball_list[$src_acct_loop_num]); $msg_iteration++)
                                {
-                                       if ($this->debug > 1) { echo 
'bofilters.run_single_filter: source_accounts ['.$src_acct_loop_num.'] 
$msg_iteration iteration ['.$msg_iteration.'] ACTION loop<br>'; }
+                                       if ($this->debug > 1) { echo 
'bofilters.run_single_filter: source_accounts ['.$src_acct_loop_num.'] 
$msg_iteration iteration ['.$msg_iteration.'] ACTION loop<br />'; }
                                        // do we need to do something with this 
message?
                                        $match_keeper = 
$this->inbox_full_msgball_list[$src_acct_loop_num][$msg_iteration]['match_keeper'];
                                        if ($match_keeper == F_ROW_MATCHES)
@@ -1659,7 +1659,7 @@
                                                else
                                                {
                                                        // 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->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')
                                                        {
@@ -1670,14 +1670,14 @@
                                                                
$to_fldball['folder'] = $target_folder['folder'];
                                                                
$to_fldball['acctnum'] = (int)$target_folder['acctnum'];
                                                                if 
($this->debug > 2) { echo 'bofilters.run_single_filter: $to_fldball 
DUMP:<pre>'; print_r($to_fldball); echo "</pre>\r\n"; }
-                                                               if 
($this->debug > 1) { echo 'bofilters.run_single_filter: pre-move info: 
$mov_msgball [<code>'.serialize($mov_msgball).'</code>]<br>'; }
-                                                               //echo 'EXIT 
NOT READY TO APPLY THE FILTER YET<br>';
+                                                               if 
($this->debug > 1) { echo 'bofilters.run_single_filter: pre-move info: 
$mov_msgball [<code>'.serialize($mov_msgball).'</code>]<br />'; }
+                                                               //echo 'EXIT 
NOT READY TO APPLY THE FILTER YET<br />';
                                                                $good_to_go = 
$GLOBALS['phpgw']->msg->industrial_interacct_mail_move($positive_msgball, 
$to_fldball);
                                                                        
                                                                if 
(!$good_to_go)
                                                                {
                                                                        // ERROR
-                                                                       if 
($this->debug > 1) { echo 'bofilters.run_single_filter: ERROR: 
industrial_interacct_mail_move returns FALSE<br>'; }
+                                                                       if 
($this->debug > 1) { echo 'bofilters.run_single_filter: ERROR: 
industrial_interacct_mail_move returns FALSE<br />'; }
                                                                        return 
False;
                                                                }
                                                                // since we 
acted on this message, since we MOVED this message
@@ -1692,7 +1692,7 @@
                                                        else
                                                        {
                                                                // 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>'; }
+                                                               if 
($this->debug > 1) { echo 'bofilters.run_single_filter: actions not yet coded: 
$this_filter[actions][0][judgement] : 
['.$this_filter['actions'][0]['judgement'].']<br />'; }
                                                        }
                                                        // POST ACTION STUFF
                                                        // n/a
@@ -1723,8 +1723,8 @@
                        if (($this->just_testing())
                        && (count($this_filter_matching_msgballs) > 0))
                        {
-                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter: Filter Test Run<br>'; }
-                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter: number of matches $this_filter_matching_msgballs 
= ' .count($this_filter_matching_msgballs).'<br>'."\r\n"; }
+                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter: Filter Test Run<br />'; }
+                               if ($this->debug > 1) { echo 
'bofilters.run_single_filter: number of matches $this_filter_matching_msgballs 
= ' .count($this_filter_matching_msgballs).'<br />'."\r\n"; }
                                // make a "fake" folder_info array to make 
things simple for get_msg_list_display
                                $fake_folder_info['is_imap'] = True;
                                $fake_folder_info['folder_checked'] = 'INBOX';
@@ -1744,7 +1744,7 @@
                        // cleanup
                        $this_filter_matching_msgballs = 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>'; }
+                       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;
                        
                }
@@ -1805,7 +1805,7 @@
                */
                function make_imap_search_str($feed_filter)
                {
-                       if ($this->debug > 0) { echo 
'bofilters.make_imap_search_str: ENTERING<br>'; }
+                       if ($this->debug > 0) { echo 
'bofilters.make_imap_search_str: ENTERING<br />'; }
                        if ($this->debug > 2) { echo 
'bofilters.make_imap_search_str: $feed_filter DUMP:<pre>'; 
print_r($feed_filter); echo "</pre>\r\n"; }
                        /*
                        RFC2060:
@@ -1863,7 +1863,7 @@
                        
                        // do we have one search or two, or more
                        $num_search_criteria = count($feed_filter['matches']);
-                       if ($this->debug > 1) { echo 
'bofilters.make_imap_search_str: $num_search_criteria: 
['.$num_search_criteria.']<br>'; }
+                       if ($this->debug > 1) { echo 
'bofilters.make_imap_search_str: $num_search_criteria: 
['.$num_search_criteria.']<br />'; }
                        // 1st search criteria
                        // convert form submitted data into usable IMAP search 
keys
                        $search_key_sieve = 
$feed_filter['matches'][0]['examine'];
@@ -1914,19 +1914,19 @@
                        || ($look_here_imap == ''))
                        {
                                $conv_error = 'invalid or no examine data';
-                               if ($this->debug > 1) { echo '<b> *** 
error</b>: bofilters.make_imap_search_str: error: '.$conv_error."<br> \r\n"; }
+                               if ($this->debug > 1) { echo '<b> *** 
error</b>: bofilters.make_imap_search_str: error: '.$conv_error."<br /> \r\n"; }
                                return '';
                        }
                        elseif ((!isset($for_this))
                        || (trim($for_this) == ''))
                        {
                                $conv_error = 'invalid or no search string 
data';
-                               if ($this->debug > 1) { echo '<b> *** 
error</b>: bofilters.make_imap_search_str: error: '.$conv_error."<br> \r\n"; }
+                               if ($this->debug > 1) { echo '<b> *** 
error</b>: bofilters.make_imap_search_str: error: '.$conv_error."<br /> \r\n"; }
                                return '';
                        }
                        $imap_str = $look_here_imap.' "'.$for_this.'"';
                        */
-                       if ($this->debug > 0) { echo 
'bofilters.make_imap_search_str: LEAVING, $one_line_only: 
['.serialize($one_line_only).'] returning search string: 
<code>'.$final_search_str.'</code><br>'."\r\n"; }
+                       if ($this->debug > 0) { echo 
'bofilters.make_imap_search_str: LEAVING, $one_line_only: 
['.serialize($one_line_only).'] returning search string: 
<code>'.$final_search_str.'</code><br />'."\r\n"; }
                        return $final_search_str;
                }
 
@@ -2024,7 +2024,7 @@
                        $imap_search_str = $this->make_imap_search_str();
                        if (!$imap_search_str)
                        {
-                               if ($this->debug > 0) { echo '<b> *** 
error</b>: bofilters: do_imap_search: make_imap_search_str returned 
empty<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo '<b> *** 
error</b>: bofilters: do_imap_search: make_imap_search_str returned empty<br 
/>'."\r\n"; }
                                return array();
                        }
                        
@@ -2039,7 +2039,7 @@
                        && ($attempt_reuse == True))
                        {
                                // no not create, we will reuse existing
-                               echo 'bofilters: do_imap_search: reusing 
existing mail_msg object'.'<br>';
+                               echo 'bofilters: do_imap_search: reusing 
existing mail_msg object'.'<br />';
                                // we need to feed the existing object some 
params begin_request uses to re-fill the msg->args[] data
                                $reuse_feed_args = 
$GLOBALS['phpgw']->msg->get_all_args();
                                $args_array = Array();
@@ -2047,7 +2047,7 @@
                                if ((isset($this->filters[0]['source_account']))
                                && ($this->filters[0]['source_account'] != ''))
                                {
-                                       if ($this->debug > 0) { echo 
'bofilters: do_imap_search: this->filters[0][source_account] = ' 
.$this->filters[0]['source_account'].'<br>'."\r\n"; }
+                                       if ($this->debug > 0) { echo 
'bofilters: do_imap_search: this->filters[0][source_account] = ' 
.$this->filters[0]['source_account'].'<br />'."\r\n"; }
                                        $args_array['folder'] = 
$this->filters[0]['source_account'];
                                }
                                else
@@ -2059,14 +2059,14 @@
                        }
                        else
                        {
-                               if ($this->debug_index_data == True) { echo 
'bofilters: do_imap_search: creating new login email.mail_msg, cannot or not 
trying to reusing existing'.'<br>'; }
+                               if ($this->debug_index_data == True) { echo 
'bofilters: do_imap_search: creating new login email.mail_msg, cannot or not 
trying to reusing existing'.'<br />'; }
                                // new login 
                                // (1) folder (if specified) - can be left 
empty or unset, mail_msg will then assume INBOX
                                $args_array = Array();
                                if ((isset($this->filters[0]['source_account']))
                                && ($this->filters[0]['source_account'] != ''))
                                {
-                                       if ($this->debug > 0) { echo 
'bofilters: do_imap_search: this->filters[0][source_account] = ' 
.$this->filters[0]['source_account'].'<br>'."\r\n"; }
+                                       if ($this->debug > 0) { echo 
'bofilters: do_imap_search: this->filters[0][source_account] = ' 
.$this->filters[0]['source_account'].'<br />'."\r\n"; }
                                        $args_array['folder'] = 
$this->filters[0]['source_account'];
                                }
                                else
@@ -2081,7 +2081,7 @@
                        //if ((isset($this->filters[0]['source_account']))
                        //&& ($this->filters[0]['source_account'] != ''))
                        //{
-                       //      if ($this->debug > 0) { echo 'bofilters: 
do_imap_search: this->filters[0][source_account] = ' 
.$this->filters[0]['source_account'].'<br>'."\r\n"; }
+                       //      if ($this->debug > 0) { echo 'bofilters: 
do_imap_search: this->filters[0][source_account] = ' 
.$this->filters[0]['source_account'].'<br />'."\r\n"; }
                        //      $args_array['folder'] = 
$this->filters[0]['source_account'];
                        //}
                        //else
@@ -2098,14 +2098,14 @@
                        if (($initial_result_set == False)
                        || (count($initial_result_set) == 0))
                        {
-                               echo 'bofilters: do_imap_search: no hits or 
possible search error<br>'."\r\n";
+                               echo 'bofilters: do_imap_search: no hits or 
possible search error<br />'."\r\n";
                                echo 'bofilters: do_imap_search: 
server_last_error (if any) was: 
"'.$GLOBALS['phpgw']->msg->phpgw_server_last_error().'"'."\r\n";
                                // we leave this->result_set_mlist an an empty 
array, as it was initialized on class creation
                        }
                        else
                        {
                                $this->result_set = $initial_result_set;
-                               if ($this->debug > 0) { echo 'bofilters: 
do_imap_search: number of matches = ' .count($this->result_set).'<br>'."\r\n"; }
+                               if ($this->debug > 0) { echo 'bofilters: 
do_imap_search: number of matches = ' .count($this->result_set).'<br 
/>'."\r\n"; }
                                // make a "fake" folder_info array to make 
things simple for get_msg_list_display
                                $this->fake_folder_info['is_imap'] = True;
                                $this->fake_folder_info['folder_checked'] = 
$GLOBALS['phpgw']->msg->get_arg_value('folder');
@@ -2116,7 +2116,7 @@
                                $this->result_set_mlist = 
$GLOBALS['phpgw']->msg->get_msg_list_display($this->fake_folder_info,$this->result_set);
                        }
                        $GLOBALS['phpgw']->msg->end_request();
-                       //echo 'bofilters: do_imap_search: returned:<br>'; 
var_dump($this->result_set); echo "<br>\r\n";
+                       //echo 'bofilters: do_imap_search: returned:<br />'; 
var_dump($this->result_set); echo "<br />\r\n";
                }
                */
                




reply via email to

[Prev in Thread] Current Thread [Next in Thread]