[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: filemanager index.php,1.30.2.9.2.2,1.30.2.9.2.3
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: filemanager index.php,1.30.2.9.2.2,1.30.2.9.2.3 |
|
Date: |
Wed, 18 Jun 2003 06:00:00 -0400 |
Update of /cvsroot/phpgroupware/filemanager
In directory subversions:/tmp/cvs-serv20908
Modified Files:
Tag: Version-0_9_16-branch
index.php
Log Message:
reg_globals fix from mtotschnig
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/index.php,v
retrieving revision 1.30.2.9.2.2
retrieving revision 1.30.2.9.2.3
diff -C2 -r1.30.2.9.2.2 -r1.30.2.9.2.3
*** index.php 10 Jun 2003 22:26:12 -0000 1.30.2.9.2.2
--- index.php 18 Jun 2003 09:59:58 -0000 1.30.2.9.2.3
***************
*** 1453,1457 ****
for ($i = 0; $i != $show_upload_boxes; $i++)
{
! if ($badchar = bad_chars ($upload_file_name[$i], True, True))
{
echo $GLOBALS['phpgw']->common->error_list (array
(html_encode (lang('File names cannot contain "%1"', $badchar), 1)));
--- 1453,1457 ----
for ($i = 0; $i != $show_upload_boxes; $i++)
{
! if ($badchar = bad_chars ($_FILES['upload_file']['name'][$i],
True, True))
{
echo $GLOBALS['phpgw']->common->error_list (array
(html_encode (lang('File names cannot contain "%1"', $badchar), 1)));
***************
*** 1465,1469 ****
$ls_array = $GLOBALS['phpgw']->vfs->ls (array (
! 'string' => $path . '/' .
$upload_file_name[$i],
'relatives' => array (RELATIVE_NONE),
'checksubdirs' => False,
--- 1465,1469 ----
$ls_array = $GLOBALS['phpgw']->vfs->ls (array (
! 'string' => $path . '/' .
$_FILES['upload_file']['name'][$i],
'relatives' => array (RELATIVE_NONE),
'checksubdirs' => False,
***************
*** 1483,1492 ****
}
! if ($upload_file_size[$i] > 0)
{
if ($fileinfo['name'] && $fileinfo['deleteable'] != 'N')
{
$GLOBALS['phpgw']->vfs->set_attributes (array (
! 'string' =>
$upload_file_name[$i],
'relatives' => array
(RELATIVE_ALL),
'attributes' => array (
--- 1483,1492 ----
}
! if ($_FILES['upload_file']['size'][$i] > 0)
{
if ($fileinfo['name'] && $fileinfo['deleteable'] != 'N')
{
$GLOBALS['phpgw']->vfs->set_attributes (array (
! 'string' =>
$_FILES['upload_file']['name'][$i],
'relatives' => array
(RELATIVE_ALL),
'attributes' => array (
***************
*** 1494,1499 ****
'modifiedby_id' => $GLOBALS['userinfo']['username'],
'modified' => $now,
! 'size'
=> $upload_file_size[$i],
!
'mime_type' => $upload_file_type[$i],
'deleteable' => 'Y',
'comment' => stripslashes ($upload_comment[$i])
--- 1494,1499 ----
'modifiedby_id' => $GLOBALS['userinfo']['username'],
'modified' => $now,
! 'size'
=> $_FILES['upload_file']['size'][$i],
!
'mime_type' => $_FILES['upload_file']['type'][$i],
'deleteable' => 'Y',
'comment' => stripslashes ($upload_comment[$i])
***************
*** 1502,1519 ****
);
! $GLOBALS['phpgw']->vfs->cp (array (
! 'from' => $upload_file[$i],
! 'to' =>
$upload_file_name[$i],
'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)
)
);
! html_text_summary (lang('Replaced %1',
$disppath.'/'.$upload_file_name[$i]), $upload_file_size[$i]);
}
else
{
$GLOBALS['phpgw']->vfs->cp (array (
! 'from' => $upload_file[$i],
! 'to' =>
$upload_file_name[$i],
'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)
)
--- 1502,1519 ----
);
! $GLOBALS['phpgw']->vfs->cp(array (
! 'from' =>
$_FILES['upload_file']['tmp_name'][$i],
! 'to' =>
$_FILES['upload_file']['name'][$i],
'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)
)
);
! html_text_summary(lang('Replaced %1',
$disppath.'/'.$_FILES['upload_file']['name'][$i]),
$_FILES['upload_file']['size'][$i]);
}
else
{
$GLOBALS['phpgw']->vfs->cp (array (
! 'from' =>
$_FILES['upload_file']['tmp_name'][$i],
! 'to' =>
$_FILES['upload_file']['name'][$i],
'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)
)
***************
*** 1521,1540 ****
$GLOBALS['phpgw']->vfs->set_attributes (array (
! 'string' =>
$upload_file_name[$i],
'relatives' => array
(RELATIVE_ALL),
'attributes' => array (
!
'mime_type' => $upload_file_type[$i],
!
'comment' => stripslashes ($upload_comment[$i])
)
)
);
! html_text_summary (lang('Created %1',
$disppath.'/'.$upload_file_name[$i]), $upload_file_size[$i]);
}
}
! elseif ($upload_file_name[$i])
{
$GLOBALS['phpgw']->vfs->touch (array (
! 'string' =>
$upload_file_name[$i],
'relatives' => array (RELATIVE_ALL)
)
--- 1521,1540 ----
$GLOBALS['phpgw']->vfs->set_attributes (array (
! 'string' =>
$_FILES['upload_file']['name'][$i],
'relatives' => array
(RELATIVE_ALL),
'attributes' => array (
! 'mime_type' =>
$_FILES['upload_file']['type'][$i],
! 'comment' => stripslashes
($upload_comment[$i])
)
)
);
! html_text_summary(lang('Created %1',
$disppath.'/'.$_FILES['upload_file']['name'][$i]),
$_FILES['upload_file']['size'][$i]);
}
}
! elseif ($_FILES['upload_file']['name'][$i])
{
$GLOBALS['phpgw']->vfs->touch (array (
! 'string' =>
$_FILES['upload_file']['name'][$i],
'relatives' => array (RELATIVE_ALL)
)
***************
*** 1542,1549 ****
$GLOBALS['phpgw']->vfs->set_attributes (array (
! 'string' =>
$upload_file_name[$i],
'relatives' => array (RELATIVE_ALL),
'attributes' => array (
! 'mime_type' =>
$upload_file_type[$i],
'comment' =>
$upload_comment[$i]
)
--- 1542,1549 ----
$GLOBALS['phpgw']->vfs->set_attributes (array (
! 'string' =>
$_FILES['upload_file']['name'][$i],
'relatives' => array (RELATIVE_ALL),
'attributes' => array (
! 'mime_type' =>
$_FILES['upload_file']['type'][$i],
'comment' =>
$upload_comment[$i]
)
***************
*** 1551,1555 ****
);
! html_text_summary (lang('Created %1',
$disppath.'/'.$upload_file_name[$i]), $file_size[$i]);
}
}
--- 1551,1555 ----
);
! html_text_summary(lang('Created %1',
$disppath.'/'.$_FILES['upload_file']['name'][$i]), $file_size[$i]);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: filemanager index.php,1.30.2.9.2.2,1.30.2.9.2.3,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: calendar/templates/idots/images month.png,NONE,1.1.2.1 planner.png,NONE,1.1.2.1 today.png,NONE,1.1.2.1 view.png,NONE,1.1.2.1 week.png,NONE,1.1.2.1 year.png,NONE,1.1.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/setup setup.inc.php,1.37.2.6.2.7,1.37.2.6.2.8 tables_current.inc.php,1.32.2.6.2.7,1.32.2.6.2.8 tables_update.inc.php,1.53.2.9.2.10,1.53.2.9.2.11
- Previous by thread:
[Phpgroupware-cvs] CVS: calendar/templates/idots/images month.png,NONE,1.1.2.1 planner.png,NONE,1.1.2.1 today.png,NONE,1.1.2.1 view.png,NONE,1.1.2.1 week.png,NONE,1.1.2.1 year.png,NONE,1.1.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/setup setup.inc.php,1.37.2.6.2.7,1.37.2.6.2.8 tables_current.inc.php,1.32.2.6.2.7,1.32.2.6.2.8 tables_update.inc.php,1.53.2.9.2.10,1.53.2.9.2.11
- Index(es):