[Phpgroupware-cvs] email/inc/class.mail_filters.inc.php, 1.7.2.3

[nomail]

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

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

Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/inc/class.mail_filters.inc.php
diff -u email/inc/class.mail_filters.inc.php:1.7.2.2 
email/inc/class.mail_filters.inc.php:1.7.2.3
--- email/inc/class.mail_filters.inc.php:1.7.2.2        Sat Sep 13 01:46:16 2003
+++ email/inc/class.mail_filters.inc.php        Sat Nov  6 16:13:46 2004
@@ -66,7 +66,7 @@
                        // do we have data
                        if  
(!isset($GLOBALS['HTTP_POST_VARS'][$this->submit_flag]))
                        {
-                               if ($this->debug_level > 0) { echo 
'mail_filters: distill_filter_args: NO data submitted<br>'."\r\n"; }
+                               if ($this->debug_level > 0) { echo 
'mail_filters: distill_filter_args: NO data submitted<br />'."\r\n"; }
                                return Array();
                        }
                        
@@ -115,11 +115,11 @@
                                                {
                                                        // now we grab the 
index value from the key string
                                                        $match_this_idx = 
(int)$filter_X_key[6];
-                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: match_this_idx grabbed value: 
['.$match_this_idx.']<br>'; }
+                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: match_this_idx grabbed value: 
['.$match_this_idx.']<br />'; }
                                                        // grab "key" that 
comes after that match_this_idx we just got
                                                        // remember "substr" 
uses 1 as the first letter in a string, not 0, AND starts returning the letter 
AFTER the specified location
                                                        $match_grabbed_key = 
substr($filter_X_key, 8);
-                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: match_grabbed_key value: 
['.$match_grabbed_key.']<br>'; }
+                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: match_grabbed_key value: 
['.$match_grabbed_key.']<br />'; }
                                                        
$this->filters[$this_idx]['matches'][$match_this_idx][$match_grabbed_key] = 
$filter_X[$filter_X_key];
                                                }
                        /*!
@@ -141,11 +141,11 @@
                                                {
                                                        // now we grab the 
index value from the key string
                                                        $action_this_idx = 
(int)$filter_X_key[7];
-                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: action_this_idx grabbed value: 
['.$action_this_idx.']<br>'; }
+                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: action_this_idx grabbed value: 
['.$action_this_idx.']<br />'; }
                                                        // grab "key" that 
comes after that match_this_idx we just got
                                                        // remember "substr" 
uses 1 as the first letter in a string, not 0, AND starts returning the letter 
AFTER the specified location
                                                        $action_grabbed_key = 
substr($filter_X_key, 9);
-                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: action_grabbed_key value: 
['.$action_grabbed_key.']<br>'; }
+                                                       if ($this->debug_level 
> 1) { echo 'mail_filters: distill_filter_args: action_grabbed_key value: 
['.$action_grabbed_key.']<br />'; }
                                                        
$this->filters[$this_idx]['actions'][$action_this_idx][$action_grabbed_key] = 
$filter_X[$filter_X_key];
                                                }
                                        }
@@ -172,19 +172,19 @@
                        || ($look_here_imap == ''))
                        {
                                $conv_error = 'invalid or no examine data';
-                               if ($this->debug_level > 0) { echo '<b> *** 
error</b>: mail_filters: sieve_to_imap_string: error: '.$conv_error."<br> 
\r\n"; }
+                               if ($this->debug_level > 0) { echo '<b> *** 
error</b>: mail_filters: sieve_to_imap_string: 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_level > 0) { echo '<b> *** 
error</b>: mail_filters: sieve_to_imap_string: error: '.$conv_error."<br> 
\r\n"; }
+                               if ($this->debug_level > 0) { echo '<b> *** 
error</b>: mail_filters: sieve_to_imap_string: error: '.$conv_error."<br /> 
\r\n"; }
                                return '';
                        }
                        
                        $imap_str = $look_here_imap.' "'.$for_this.'"';
-                       if ($this->debug_level > 0) { echo 'mail_filters: 
sieve_to_imap_string: string is: '.$imap_str."<br>\r\n"; }
+                       if ($this->debug_level > 0) { echo 'mail_filters: 
sieve_to_imap_string: string is: '.$imap_str."<br />\r\n"; }
                        return $imap_str;
                }
 
@@ -199,7 +199,7 @@
                        $imap_search_str = $this->sieve_to_imap_string();
                        if (!$imap_search_str)
                        {
-                               if ($this->debug_level > 0) { echo '<b> *** 
error</b>: mail_filters: do_imap_search: sieve_to_imap_string returned 
empty<br>'."\r\n"; }
+                               if ($this->debug_level > 0) { echo '<b> *** 
error</b>: mail_filters: do_imap_search: sieve_to_imap_string returned empty<br 
/>'."\r\n"; }
                                return array();
                        }
                        
@@ -220,7 +220,7 @@
                        && ($attempt_reuse == True))
                        {
                                // no not create, we will reuse existing
-                               echo 'mail_filters: do_imap_search: reusing 
existing mail_msg object'.'<br>';
+                               echo 'mail_filters: 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();
@@ -228,7 +228,7 @@
                                if ((isset($this->filters[0]['source_folder']))
                                && ($this->filters[0]['source_folder'] != ''))
                                {
-                                       if ($this->debug_level > 0) { echo 
'mail_filters: do_imap_search: this->filters[0][source_folder] = ' 
.$this->filters[0]['source_folder'].'<br>'."\r\n"; }
+                                       if ($this->debug_level > 0) { echo 
'mail_filters: do_imap_search: this->filters[0][source_folder] = ' 
.$this->filters[0]['source_folder'].'<br />'."\r\n"; }
                                        $args_array['folder'] = 
$this->filters[0]['source_folder'];
                                }
                                else
@@ -240,14 +240,14 @@
                        }
                        else
                        {
-                               if ($this->debug_index_data == True) { echo 
'mail_filters: do_imap_search: creating new login email.mail_msg, cannot or not 
trying to reusing existing'.'<br>'; }
+                               if ($this->debug_index_data == True) { echo 
'mail_filters: 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_folder']))
                                && ($this->filters[0]['source_folder'] != ''))
                                {
-                                       if ($this->debug_level > 0) { echo 
'mail_filters: do_imap_search: this->filters[0][source_folder] = ' 
.$this->filters[0]['source_folder'].'<br>'."\r\n"; }
+                                       if ($this->debug_level > 0) { echo 
'mail_filters: do_imap_search: this->filters[0][source_folder] = ' 
.$this->filters[0]['source_folder'].'<br />'."\r\n"; }
                                        $args_array['folder'] = 
$this->filters[0]['source_folder'];
                                }
                                else
@@ -265,7 +265,7 @@
                        if ((isset($this->filters[0]['source_folder']))
                        && ($this->filters[0]['source_folder'] != ''))
                        {
-                               if ($this->debug_level > 0) { echo 
'mail_filters: do_imap_search: this->filters[0][source_folder] = ' 
.$this->filters[0]['source_folder'].'<br>'."\r\n"; }
+                               if ($this->debug_level > 0) { echo 
'mail_filters: do_imap_search: this->filters[0][source_folder] = ' 
.$this->filters[0]['source_folder'].'<br />'."\r\n"; }
                                $args_array['folder'] = 
$this->filters[0]['source_folder'];
                        }
                        else
@@ -284,14 +284,14 @@
                        if (($initial_result_set == False)
                        || (count($initial_result_set) == 0))
                        {
-                               echo 'mail_filters: do_imap_search: no hits or 
possible search error<br>'."\r\n";
+                               echo 'mail_filters: do_imap_search: no hits or 
possible search error<br />'."\r\n";
                                echo 'mail_filters: 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_level > 0) { echo 
'mail_filters: do_imap_search: number of matches = ' 
.count($this->result_set).'<br>'."\r\n"; }
+                               if ($this->debug_level > 0) { echo 
'mail_filters: 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');
@@ -302,7 +302,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 'mail_filters: do_imap_search: returned:<br>'; 
var_dump($this->result_set); echo "<br>\r\n";
+                       //echo 'mail_filters: do_imap_search: returned:<br />'; 
var_dump($this->result_set); echo "<br />\r\n";
                }
 
                /*!