[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc/class.boattach_file.inc.php, 1.4.2.5
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] email/inc/class.boattach_file.inc.php, 1.4.2.5 |
|
Date: |
Sat, 6 Nov 2004 17:13:44 +0100 |
Update of /email/inc
Modified Files:
Branch: Version-0_9_16-branch
class.boattach_file.inc.php
date: 2004/11/06 16:13:44; author: powerstat; state: Exp; lines: +47 -47
Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/inc/class.boattach_file.inc.php
diff -u email/inc/class.boattach_file.inc.php:1.4.2.4
email/inc/class.boattach_file.inc.php:1.4.2.5
--- email/inc/class.boattach_file.inc.php:1.4.2.4 Fri Feb 6 19:38:09 2004
+++ email/inc/class.boattach_file.inc.php Sat Nov 6 16:13:44 2004
@@ -95,7 +95,7 @@
function set_ref_var_holder(&$ref_template)
{
// NOT IMPLEMENTED YET
- if ($this->debug > 1) { echo
'emai1.boattach_file.set_ref_var_holder ('.__LINE__.'): param (a reference) is
gettype '.serialize(gettype($ref_template)).' and param\'s class name is
['.get_class($ref_template).'] <br>'; }
+ if ($this->debug > 1) { echo
'emai1.boattach_file.set_ref_var_holder ('.__LINE__.'): param (a reference) is
gettype '.serialize(gettype($ref_template)).' and param\'s class name is
['.get_class($ref_template).'] <br />'; }
if ($this->debug > 2) { echo
'emai1.boattach_file.set_ref_var_holder ('.__LINE__.'): param (a reference)
DUMP<pre>'; print_r($ref_template); echo '</pre>'; }
if ( (isset($ref_template))
&& ($this->var_holder != '##NOTHING') )
@@ -169,7 +169,7 @@
*/
function fill_file_data_gpc()
{
- if ($this->debug > 0) { echo 'ENTERING
emai.boattach_file.fill_file_data_gpc ('.__LINE__.') <br>'; }
+ if ($this->debug > 0) { echo 'ENTERING
emai.boattach_file.fill_file_data_gpc ('.__LINE__.') <br />'; }
/*
//PHP VARIABLES NOTES:
// $uploadedfile was the name of the file box in the
submitted form, and php3 gives it additional properties:
@@ -190,7 +190,7 @@
if (($GLOBALS['phpgw']->msg->minimum_version("4.1.0"))
&& (!isset($GLOBALS['phpgw']->msg->ref_FILES)))
{
- echo 'emai1.boattach_file.fill_file_data_gpc
('.__LINE__.'): ERROR: $GLOBALS[phpgw]->msg->ref_FILES should be set here, but
it IS NOT set<br>';
+ echo 'emai1.boattach_file.fill_file_data_gpc
('.__LINE__.'): ERROR: $GLOBALS[phpgw]->msg->ref_FILES should be set here, but
it IS NOT set<br />';
}
// the following code only applies to php < 4.1.0 where
that superglobal was not available
@@ -216,8 +216,8 @@
// or we may have otherwise obtained a good reference
above
||
(isset($GLOBALS['phpgw']->msg->ref_FILES['uploadedfile'])) )
{
- if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): using msg->ref_FILES to
fill $this->file_data[] <br>'; }
- if ($this->debug > 2) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): msg->ref_FILE dump:
'.htmlspecialchars(serialize($GLOBALS['phpgw']->msg->ref_FILES)).'<br>'; }
+ if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): using msg->ref_FILES to
fill $this->file_data[] <br />'; }
+ if ($this->debug > 2) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): msg->ref_FILE dump:
'.htmlspecialchars(serialize($GLOBALS['phpgw']->msg->ref_FILES)).'<br />'; }
$this->file_data['file_tmp_name'] =
$GLOBALS['phpgw']->msg->stripslashes_gpc(trim($GLOBALS['phpgw']->msg->ref_FILES['uploadedfile']['tmp_name']));
$this->file_data['file_name'] =
$GLOBALS['phpgw']->msg->stripslashes_gpc(trim($GLOBALS['phpgw']->msg->ref_FILES['uploadedfile']['name']));
$this->file_data['file_size'] =
$GLOBALS['phpgw']->msg->stripslashes_gpc(trim($GLOBALS['phpgw']->msg->ref_FILES['uploadedfile']['size']));
@@ -226,7 +226,7 @@
else
{
// real OLD STYLE way to get this info
- if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): no valid msg->ref_FILES
available, using ANCIENT old, bad (we have to global 4 vars) to fill
this->file_data[] <br>'; }
+ if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): no valid msg->ref_FILES
available, using ANCIENT old, bad (we have to global 4 vars) to fill
this->file_data[] <br />'; }
global $uploadedfile, $uploadedfile_name,
$uploadedfile_size, $uploadedfile_type;
// php less then 4.1 uses these
pre-superglobals enviornment vars
$this->file_data['file_tmp_name'] =
$GLOBALS['phpgw']->msg->stripslashes_gpc(trim($uploadedfile));
@@ -245,12 +245,12 @@
}
// Netscape 6 passes file_name with a full path, we
need to extract just the filename
- if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): file_name
(pre-wbasename): ' .$this->file_data['file_name'] .'<br>'; }
+ if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): file_name
(pre-wbasename): ' .$this->file_data['file_name'] .'<br />'; }
$this->file_data['file_name'] =
$this->wbasename($this->file_data['file_name']);
- if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): file_name
(post-wbasename): ' .$this->file_data['file_name'] .'<br>'; }
+ if ($this->debug > 1) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): file_name
(post-wbasename): ' .$this->file_data['file_name'] .'<br />'; }
if ($this->debug > 2) { echo
'emai.boattach_file.fill_file_data_gpc ('.__LINE__.'): filled $this->file_data
DUMP<pre>'; print_r($this->file_data); echo '</pre>'; }
- if ($this->debug > 0) { echo 'LEAVING
emai.boattach_file.fill_file_data_gpc ('.__LINE__.')<br>'; }
+ if ($this->debug > 0) { echo 'LEAVING
emai.boattach_file.fill_file_data_gpc ('.__LINE__.')<br />'; }
}
@@ -264,7 +264,7 @@
*/
function attach()
{
- if ($this->debug > 0) { echo 'ENTERING
emai.boattach_file.attach'.'<br>'; }
+ if ($this->debug > 0) { echo 'ENTERING
emai.boattach_file.attach'.'<br />'; }
if ($this->debug > 2) { echo
'emai.boattach_file.attach: initial $GLOBALS[phpgw_info][flags] DUMP<pre>';
print_r($GLOBALS['phpgw_info']['flags']); echo '</pre>'; }
// TRICK1: use the GLOBAL template established in the
UI file (called first)
@@ -276,7 +276,7 @@
// probably should remove this line later on
if (isset($this->var_holder) == False)
{
- echo 'emai.boattach_file.attach ('.__LINE__.'):
ERROR: initial $this->var_holder needs to be set by this point in the code
<br>';
+ echo 'emai.boattach_file.attach ('.__LINE__.'):
ERROR: initial $this->var_holder needs to be set by this point in the code <br
/>';
}
// initialize some variables
@@ -295,11 +295,11 @@
//if
(!file_exists($GLOBALS['phpgw_info']['server']['temp_dir']))
if
(!is_dir($GLOBALS['phpgw_info']['server']['temp_dir']))
{
- $alert_msg .= 'Error:'.'<br>'
- . 'Server is unable to access phpgw tmp
directory'.'<br>'
- .
$GLOBALS['phpgw_info']['server']['temp_dir'].'<br>'
- . 'Please check your
configuration'.'<br>'
- . '<br>';
+ $alert_msg .= 'Error:'.'<br />'
+ . 'Server is unable to access phpgw tmp
directory'.'<br />'
+ .
$GLOBALS['phpgw_info']['server']['temp_dir'].'<br />'
+ . 'Please check your
configuration'.'<br />'
+ . '<br />';
}
//if
(!file_exists($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP .
$GLOBALS['phpgw_info']['user']['sessionid']))
@@ -319,11 +319,11 @@
//if (!file_exists($this->uploaddir))
if (!is_dir($this->uploaddir))
{
- $alert_msg .= 'Error:'.'<br>'
- . 'Server is unable to access phpgw
email tmp directory'.'<br>'
- . $this->uploaddir.'<br>'
- . 'Please check your
configuration'.'<br>'
- . '<br>';
+ $alert_msg .= 'Error:'.'<br />'
+ . 'Server is unable to access phpgw
email tmp directory'.'<br />'
+ . $this->uploaddir.'<br />'
+ . 'Please check your
configuration'.'<br />'
+ . '<br />';
}
// grab externally provided information
@@ -337,7 +337,7 @@
if ($this->control_data['action'] == lang('Delete')
|| $this->control_data['action'] ==
htmlentities(lang('Delete')))
{
- if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): <b>REQUEST TO DELETE</b> detected
$this->control_data[action] ('.$this->control_data['action'].') == lang(Delete)
('.lang('Delete').'): <br>'; }
+ if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): <b>REQUEST TO DELETE</b> detected
$this->control_data[action] ('.$this->control_data['action'].') == lang(Delete)
('.lang('Delete').'): <br />'; }
// sometimes $this->control_data[delete][]
seems to have multiple entries for the same filename
for ($i=0;
$i<count($this->control_data['delete']); $i++)
{
@@ -345,22 +345,22 @@
$full_fname_metafile =
$this->uploaddir.SEP.$this->control_data['delete'][$i] . '.info';
if (file_exists($full_fname_attachment))
{
- if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] deleting file:
['.$full_fname_attachment.']: <br>'; }
+ if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] deleting file:
['.$full_fname_attachment.']: <br />'; }
unlink($full_fname_attachment);
}
else
{
- if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] request to deleting
NON-EXISTING file: ['.$full_fname_attachment.']: <br>'; }
+ if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] request to deleting
NON-EXISTING file: ['.$full_fname_attachment.']: <br />'; }
}
// and the associated ".info" metafile
if (file_exists($full_fname_metafile))
{
- if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] deleting related meta file:
['.$full_fname_metafile.']: <br>'; }
+ if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] deleting related meta file:
['.$full_fname_metafile.']: <br />'; }
unlink($full_fname_metafile);
}
else
{
- if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] request to deleting
NON-EXISTING file: ['.$full_fname_metafile.']: <br>'; }
+ if ($this->debug > 1) { echo
'boattach_file.attach ('.__LINE__.'): loop['.$i.'] request to deleting
NON-EXISTING file: ['.$full_fname_metafile.']: <br />'; }
}
}
}
@@ -393,10 +393,10 @@
(($this->file_data['file_tmp_name'] == '') ||
($this->file_data['file_tmp_name'] == 'none')))
{
$langed_attach_file = lang("Attach File");
- $alert_msg = lang('Input Error:').'<br>'
- . lang('Please submit a filename to
attach').'<br>'
- . lang('You must click %1 for the file
to actually upload','"'.lang('Attach File').'"').'.<br>'
- . '<br>';
+ $alert_msg = lang('Input Error:').'<br />'
+ . lang('Please submit a filename to
attach').'<br />'
+ . lang('You must click %1 for the file
to actually upload','"'.lang('Attach File').'"').'.<br />'
+ . '<br />';
}
$dh = opendir($this->uploaddir);
@@ -458,25 +458,25 @@
}
// begin DEBUG INFO (this is old, needs updating)
- $debuginfo .= '--uploadedfile info: <br>'
- . '$GLOBALS[phpgw_info][server][temp_dir]:
'.$GLOBALS['phpgw_info']['server']['temp_dir'].'<br>'
- . '$GLOBALS[phpgw_info][user][sessionid]:
'.$GLOBALS['phpgw_info']['user']['sessionid'].'<br>'
- . '$this->uploaddir: '.$this->uploaddir.'<br>'
- . 'file_tmp_name: '
.$this->file_data['file_tmp_name'] .'<br>'
- . 'file_name: ' .$this->file_data['file_name']
.'<br>'
- . 'file_size: ' .$this->file_data['file_size']
.'<br>'
- . 'file_type: ' .$this->file_data['file_type']
.'<br>'
- . '<br>'
- . 'totalfiles: ' .$totalfiles .'<br>'
- . 'file_info_count: '.count($file_info) .'<br>'
- . '<br>';
+ $debuginfo .= '--uploadedfile info: <br />'
+ . '$GLOBALS[phpgw_info][server][temp_dir]:
'.$GLOBALS['phpgw_info']['server']['temp_dir'].'<br />'
+ . '$GLOBALS[phpgw_info][user][sessionid]:
'.$GLOBALS['phpgw_info']['user']['sessionid'].'<br />'
+ . '$this->uploaddir: '.$this->uploaddir.'<br />'
+ . 'file_tmp_name: '
.$this->file_data['file_tmp_name'] .'<br />'
+ . 'file_name: ' .$this->file_data['file_name']
.'<br />'
+ . 'file_size: ' .$this->file_data['file_size']
.'<br />'
+ . 'file_type: ' .$this->file_data['file_type']
.'<br />'
+ . '<br />'
+ . 'totalfiles: ' .$totalfiles .'<br />'
+ . 'file_info_count: '.count($file_info) .'<br
/>'
+ . '<br />';
if (count($file_info) > 0)
{
- $debuginfo .= '<br>
file_info[0]='.$file_info[0] .'<br> file_info[1]='.$file_info[1];
+ $debuginfo .= '<br />
file_info[0]='.$file_info[0] .'<br /> file_info[1]='.$file_info[1];
}
- $debuginfo .= '<br>';
+ $debuginfo .= '<br />';
//print_debug('$debuginfo', $debuginfo);
- if ($this->debug > 1) { echo '$debuginfo:
'.$debuginfo.'<br>'; }
+ if ($this->debug > 1) { echo '$debuginfo:
'.$debuginfo.'<br />'; }
// end DEBUG INFO
// where to submit the form to
@@ -532,7 +532,7 @@
$GLOBALS['phpgw']->common->phpgw_exit(False);
*/
- if ($this->debug > 0) { echo 'LEAVING
emai.boattach_file.attach'.'<br>'; }
+ if ($this->debug > 0) { echo 'LEAVING
emai.boattach_file.attach'.'<br />'; }
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc/class.boattach_file.inc.php, 1.4.2.5,
nomail <=