[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc/class.bosend.inc.php, 1.11.2.4
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] email/inc/class.bosend.inc.php, 1.11.2.4 |
|
Date: |
Sat, 6 Nov 2004 17:13:45 +0100 |
Update of /email/inc
Modified Files:
Branch: Version-0_9_16-branch
class.bosend.inc.php
date: 2004/11/06 16:13:45; author: powerstat; state: Exp; lines: +41 -41
Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/inc/class.bosend.inc.php
diff -u email/inc/class.bosend.inc.php:1.11.2.3
email/inc/class.bosend.inc.php:1.11.2.4
--- email/inc/class.bosend.inc.php:1.11.2.3 Thu Nov 13 18:43:00 2003
+++ email/inc/class.bosend.inc.php Sat Nov 6 16:13:45 2004
@@ -43,7 +43,7 @@
function bosend()
{
- if ($this->debug_constructor > 0) { echo 'email.bosend
*constructor*: ENTERING<br>'; }
+ if ($this->debug_constructor > 0) { echo 'email.bosend
*constructor*: ENTERING<br />'; }
// May 9, 2003 Ryan Bonham adds company disclaimer code
// This Disclaimer will be added to any out going mail
@@ -53,7 +53,7 @@
$this->msg_bootstrap->ensure_mail_msg_exists('email.bosend.constructor',
$this->debug_send);
$this->not_set = $GLOBALS['phpgw']->msg->not_set;
- if ($this->debug_constructor > 0) { echo 'email.bosend
*constructor*: LEAVING<br>'; }
+ if ($this->debug_constructor > 0) { echo 'email.bosend
*constructor*: LEAVING<br />'; }
}
/*!
@@ -142,11 +142,11 @@
$success =
$GLOBALS['phpgw']->msg->phpgw_append($sent_folder_name,
$GLOBALS['phpgw']->mail_send->assembled_copy."\r\n",
"\\Seen");
- //if ($success) { echo 'append to sent OK<br>';
} else { echo 'append to sent FAILED<br>'; echo 'imap_last_error:
'.imap_last_error().'<br>'; }
+ //if ($success) { echo 'append to sent OK<br
/>'; } else { echo 'append to sent FAILED<br />'; echo 'imap_last_error:
'.imap_last_error().'<br />'; }
//}
//else
//{
- //echo 'NO STREAM available for sent folder
append<br>';
+ //echo 'NO STREAM available for sent folder
append<br />';
// return False;
//}
@@ -175,7 +175,7 @@
*/
function sendorspell()
{
- if ($this->debug_sendorspell > 0) { echo 'ENTERING:
email.bosend.sendorspell'.'<br>'; }
+ if ($this->debug_sendorspell > 0) { echo 'ENTERING:
email.bosend.sendorspell'.'<br />'; }
if ($this->debug_sendorspell > 2) { echo
'email.bosend.sendorspell: data dump: $GLOBALS[HTTP_POST_VARS]<pre>';
print_r($GLOBALS['phpgw']->msg->ref_POST); echo '</pre>'."\r\n";
echo
'email.bosend.sendorspell: data dump: $GLOBALS[HTTP_GET_VARS]<pre>';
print_r($GLOBALS['phpgw']->msg->ref_GET); echo '</pre>'."\r\n"; }
@@ -183,22 +183,22 @@
if
((isset($GLOBALS['phpgw']->msg->ref_POST['btn_spellcheck']))
&& ($GLOBALS['phpgw']->msg->ref_POST['btn_spellcheck']
!= ''))
{
- if ($this->debug_sendorspell > 1) { echo
'email.bosend.sendorspell: "btn_spellcheck" is set; calling
$this->spellcheck()'.'<br>'; }
+ if ($this->debug_sendorspell > 1) { echo
'email.bosend.sendorspell: "btn_spellcheck" is set; calling
$this->spellcheck()'.'<br />'; }
$this->spellcheck();
}
elseif
((isset($GLOBALS['phpgw']->msg->ref_POST['btn_send']))
&& ($GLOBALS['phpgw']->msg->ref_POST['btn_send'] != ''))
{
- if ($this->debug_sendorspell > 1) { echo
'email.bosend.sendorspell: "btn_send" is set; calling $this->send()'.'<br>'; }
+ if ($this->debug_sendorspell > 1) { echo
'email.bosend.sendorspell: "btn_send" is set; calling $this->send()'.'<br />'; }
$this->send();
}
else
{
- if ($this->debug_sendorspell > 1) { echo ':
email.bosend.sendorspell: ERROR: neither "btn_spellcheck" not "btn_send" is
set; fallback action $this->send()'.'<br>'; }
+ if ($this->debug_sendorspell > 1) { echo ':
email.bosend.sendorspell: ERROR: neither "btn_spellcheck" not "btn_send" is
set; fallback action $this->send()'.'<br />'; }
$this->send();
}
- if ($this->debug_sendorspell > 0) { echo 'LEAVING:
email.bosend.sendorspell'.'<br>'; }
+ if ($this->debug_sendorspell > 0) { echo 'LEAVING:
email.bosend.sendorspell'.'<br />'; }
}
@@ -211,7 +211,7 @@
*/
function spellcheck()
{
- if ($this->debug_spellcheck > 0) { echo 'ENTERING:
email.bosend.spellcheck'.'<br>'; }
+ if ($this->debug_spellcheck > 0) { echo 'ENTERING:
email.bosend.spellcheck'.'<br />'; }
if ($this->debug_spellcheck > 2) { echo
'email.bosend.spellcheck: data dump: $GLOBALS[HTTP_POST_VARS]<pre>';
print_r($GLOBALS['phpgw']->msg->ref_POST); echo '</pre>'."\r\n";
echo
'email.bosend.spellcheck: data dump: $GLOBALS[HTTP_GET_VARS]<pre>';
print_r($GLOBALS['phpgw']->msg->ref_GET); echo '</pre>'."\r\n"; }
@@ -252,7 +252,7 @@
- if ($this->debug_spellcheck > 0) { echo 'LEAVING:
email.bosend.spellcheck'.'<br>'; }
+ if ($this->debug_spellcheck > 0) { echo 'LEAVING:
email.bosend.spellcheck'.'<br />'; }
}
/*!
@@ -267,7 +267,7 @@
*/
function send()
{
- if ($this->debug_send> 0) { echo 'ENTERING:
email.bosend.send'.'<br>'; }
+ if ($this->debug_send> 0) { echo 'ENTERING:
email.bosend.send'.'<br />'; }
if ($this->debug_send> 2) { echo
'email.bosend.send: data dump: $GLOBALS[HTTP_POST_VARS]<pre>';
print_r($GLOBALS['phpgw']->msg->ref_POST); echo '</pre>'."\r\n";
echo
'email.bosend.send: data dump: $GLOBALS[HTTP_GET_VARS]<pre>';
print_r($GLOBALS['phpgw']->msg->ref_GET); echo '</pre>'."\r\n";
@@ -685,7 +685,7 @@
/*
// ===== DEBUG =====
- echo '<br>';
+ echo '<br />';
//$dubug_info = $to;
//$dubug_info = ereg_replace("\r\n.", "CRLF_WSP",
$dubug_info);
//$dubug_info = ereg_replace("\r\n", "CRLF",
$dubug_info);
@@ -694,13 +694,13 @@
//echo serialize($dubug_info);
//$to = $GLOBALS['phpgw']->msg->addy_array_to_str($to,
True);
- //echo 'to including personal:
'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($to).'<br>';
+ //echo 'to including personal:
'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($to).'<br />';
- echo '<br> var dump mail_out <br>';
+ echo '<br /> var dump mail_out <br />';
var_dump($this->mail_out);
- //echo '<br> var dump cc <br>';
+ //echo '<br /> var dump cc <br />';
//var_dump($cc);
- echo '<br>';
+ echo '<br />';
$GLOBALS['phpgw']->common->phpgw_footer();
exit;
@@ -830,7 +830,7 @@
$this->mail_out['fwd_info']['boundary'] =
$not_set;
for ($p = 0; $p <
$part_nice['ex_num_param_pairs']; $p++)
{
- //echo '<br>params['.$p.']:
'.$part_nice['params'][$p]['attribute'].'='.$part_nice['params'][$p]['value']
.'<br>';
+ //echo '<br />params['.$p.']:
'.$part_nice['params'][$p]['attribute'].'='.$part_nice['params'][$p]['value']
.'<br />';
if
(($part_nice['params'][$p]['attribute'] == 'boundary')
&& ($part_nice['params'][$p]['value']
!= $not_set))
{
@@ -843,8 +843,8 @@
// original email ALREADY HAS a
boundary., so use it!
$this->mail_out['boundary'] =
$this->mail_out['fwd_info']['boundary'];
}
- //echo '<br>part_nice[boundary] '
.$this->mail_out['fwd_info']['boundary'] .'<br>';
- //echo '<br>part_nice: <br>'
.$GLOBALS['phpgw']->msg->htmlspecialchars_encode(serialize($this->mail_out))
.'<br>';
+ //echo '<br />part_nice[boundary] '
.$this->mail_out['fwd_info']['boundary'] .'<br />';
+ //echo '<br />part_nice: <br />'
.$GLOBALS['phpgw']->msg->htmlspecialchars_encode(serialize($this->mail_out))
.'<br />';
// prepare the mime part headers
// original body gets pushed down one part,
i.e. was part 1, now is part 2
@@ -860,7 +860,7 @@
}
for ($p = 0; $p <
$part_nice['ex_num_param_pairs']; $p++)
{
- //echo '<br>params['.$p.']:
'.$part_nice['params'][$p]['attribute'].'='.$part_nice['params'][$p]['value']
.'<br>';
+ //echo '<br />params['.$p.']:
'.$part_nice['params'][$p]['attribute'].'='.$part_nice['params'][$p]['value']
.'<br />';
if
($part_nice['params'][$p]['attribute'] != 'boundary')
{
$this->mail_out['body'][$body_part_num]['mime_headers'][$m_line] = '
'.$part_nice['params'][$p]['attribute'].'="'.$part_nice['params'][$p]['value'].'"';
@@ -933,13 +933,13 @@
/*
- //echo 'fwd_this[sub_header]:
<br><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($fwd_this['sub_header']).'</pre><br>';
- //echo 'fwd_this[matches]:
<br><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode(serialize($fwd_this['matches'])).'</pre><br>';
- //echo 'fwd_this[boundaries]:
<br><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($fwd_this['boundaries']).'</pre><br>';
- //echo '=== var dump fwd_this <br><pre>';
+ //echo 'fwd_this[sub_header]: <br
/><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($fwd_this['sub_header']).'</pre><br
/>';
+ //echo 'fwd_this[matches]: <br
/><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode(serialize($fwd_this['matches'])).'</pre><br
/>';
+ //echo 'fwd_this[boundaries]: <br
/><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($fwd_this['boundaries']).'</pre><br
/>';
+ //echo '=== var dump fwd_this <br /><pre>';
//var_dump($fwd_this);
- //echo '</pre><br>';
- echo 'fwd_this[processed]:
<br><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($fwd_this['processed']).'</pre><br>';
+ //echo '</pre><br />';
+ echo 'fwd_this[processed]: <br
/><pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($fwd_this['processed']).'</pre><br
/>';
unset($fwd_this);
exit;
*/
@@ -956,12 +956,12 @@
/*
// ===== DEBUG =====
- echo '<br>';
- echo '<br>=== mail_out ===<br>';
+ echo '<br />';
+ echo '<br />=== mail_out ===<br />';
$dubug_info = serialize($this->mail_out);
$dubug_info =
$GLOBALS['phpgw']->msg->htmlspecialchars_encode($dubug_info);
echo $dubug_info;
- echo '<br>';
+ echo '<br />';
$GLOBALS['phpgw']->common->phpgw_footer();
exit;
@@ -989,7 +989,7 @@
$info_file =
$upload_dir.SEP.$file.'.info';
$file_info =
file($info_file);
- if ($this->debug_struct
> 2) { echo 'FILE INFO: '.htmlspecialchars(serialize($file_info)).'<br>'; }
+ if ($this->debug_struct
> 2) { echo 'FILE INFO: '.htmlspecialchars(serialize($file_info)).'<br />'; }
$content_type =
trim($file_info[0]);
$content_name =
trim($file_info[1]);
@@ -1029,7 +1029,7 @@
$next_pos = 0;
while ($datachunk =
fread($fh, 57))
{
- if
($this->debug_struct > 2) { echo '$next_pos ['.$next_pos.'] :: string
['.$datachunk.'] :: b64 version ['.base64_encode($datachunk).']<br>'."\r\n"; }
+ if
($this->debug_struct > 2) { echo '$next_pos ['.$next_pos.'] :: string
['.$datachunk.'] :: b64 version ['.base64_encode($datachunk).']<br />'."\r\n";
}
$this->mail_out['body'][$body_part_num]['mime_body'][$next_pos] =
base64_encode($datachunk);
$next_pos++;
}
@@ -1185,12 +1185,12 @@
/*
// ===== DEBUG =====
- echo '<br>';
- echo '<br>=== mail_out ===<br>';
+ echo '<br />';
+ echo '<br />=== mail_out ===<br />';
$dubug_info = serialize($this->mail_out);
$dubug_info =
$GLOBALS['phpgw']->msg->htmlspecialchars_encode($dubug_info);
echo $dubug_info;
- echo '<br>';
+ echo '<br />';
// ===== DEBUG =====
*/
@@ -1199,11 +1199,11 @@
/*
// ===== DEBUG =====
- echo '<br>';
+ echo '<br />';
echo 'retain_copy:
'.serialize($GLOBALS['phpgw']->mail_send->retain_copy);
- echo '<br>=== POST SEND ===<br>';
+ echo '<br />=== POST SEND ===<br />';
echo
'<pre>'.$GLOBALS['phpgw']->msg->htmlspecialchars_encode($GLOBALS['phpgw']->mail_send->assembled_copy).'</pre>';
- echo '<br>';
+ echo '<br />';
// ===== DEBUG =====
*/
@@ -1267,8 +1267,8 @@
echo '<pre>'."\r\n";
print_r($GLOBALS['phpgw']->mail_send->trace_data);
echo '</pre>'."\r\n";
- echo '<p> <br></p>'."\r\n";
- echo '<p>To go back to the msg list,
click <a href="'.$return_to_folder_href.'">here</a></p><br>';
+ echo '<p> <br /></p>'."\r\n";
+ echo '<p>To go back to the msg list,
click <a href="'.$return_to_folder_href.'">here</a></p><br />';
echo '</body></html>';
$this->send_message_cleanup();
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc/class.bosend.inc.php, 1.11.2.4,
nomail <=