[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/class.boentity.php, 1.1.1.10
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] property/class.boentity.php, 1.1.1.10 |
|
Date: |
Sun, 23 May 2004 07:04:55 -0000 |
Update of /property
Modified Files:
Branch:
class.boentity.php
date: 2004/05/01 20:00:27; author: sigurdne; state: Exp; lines: +24 -22
Log Message:
no message
=====================================================================
Index: property/class.boentity.php
diff -u property/class.boentity.php:1.1.1.9 property/class.boentity.php:1.1.1.10
--- property/class.boentity.php:1.1.1.9 Fri Apr 30 17:35:56 2004
+++ property/class.boentity.php Sat May 1 20:00:27 2004
@@ -62,7 +62,7 @@
$entity_id =
$this->bocommon->get_var2('entity_id',array('POST','GET'));
$status =
$this->bocommon->get_var2('status',array('POST','GET'));
- $this->soadmin_entity =
CreateObject($this->currentapp.'_soadmin_entity',$entity_id,$cat_id);
+ $this->soadmin_entity =
CreateObject($this->currentapp.'_soadmin_entity',array('entity_id'=>$entity_id,'cat_id'=>$cat_id));
$this->category_name =
$this->soadmin_entity->category_name;
if ($start)
@@ -382,15 +382,17 @@
$entity['lookup_functions'] .= '}'."\r\n";
}
- $this->vfs->override_acl = 1;
+ if($entity['files'][0]['file_id'])
+ {
+ $this->vfs->override_acl = 1;
- $entity['files'] = $this->vfs->ls (array(
- 'string' => $this->fakebase. SEP .
$this->category_name . SEP . $entity['location_data']['loc1'] . SEP .
$data['id'],
+ $entity['files'] = $this->vfs->ls (array(
+ 'string' => $this->fakebase. '/' .
$this->category_name . '/' . $entity['location_data']['loc1'] . '/' .
$data['id'],
'relatives' => array(RELATIVE_NONE)));
- $this->vfs->override_acl = 0;
-
- if(!$entity['files'][0]['file_id'])
+ $this->vfs->override_acl = 0;
+ }
+ else
{
unset($entity['files']);
}
@@ -406,24 +408,24 @@
function create_home_dir()
{
if(!$this->vfs->file_exists(array(
- 'string' => $this->fakebase. SEP .
$this->category_name,
+ 'string' => $this->fakebase. '/' .
$this->category_name,
'relatives' => Array(RELATIVE_NONE)
)))
{
$this->vfs->override_acl = 1;
if(!$this->vfs->mkdir (array(
- 'string' => $this->fakebase. SEP .
$this->category_name,
+ 'string' => $this->fakebase. '/' .
$this->category_name,
'relatives' => array(
RELATIVE_NONE
)
)))
{
-
$receipt['error'][]=array('msg'=>lang('failed to create directory') . ' :'.
$this->fakebase. SEP . $this->category_name);
+
$receipt['error'][]=array('msg'=>lang('failed to create directory') . ' :'.
$this->fakebase. '/' . $this->category_name);
}
else
{
-
$receipt['message'][]=array('msg'=>lang('directory created') . ' :'.
$this->fakebase. SEP . $this->category_name);
+
$receipt['message'][]=array('msg'=>lang('directory created') . ' :'.
$this->fakebase. '/' . $this->category_name);
}
$this->vfs->override_acl = 0;
}
@@ -434,46 +436,46 @@
function create_document_dir($loc1='',$id='')
{
if(!$this->vfs->file_exists(array(
- 'string' => $this->fakebase. SEP .
$this->category_name . SEP . $loc1,
+ 'string' => $this->fakebase. '/' .
$this->category_name . '/' . $loc1,
'relatives' => Array(RELATIVE_NONE)
)))
{
$this->vfs->override_acl = 1;
if(!$this->vfs->mkdir (array(
- 'string' => $this->fakebase. SEP .
$this->category_name . SEP . $loc1,
+ 'string' => $this->fakebase. '/' .
$this->category_name . '/' . $loc1,
'relatives' => array(
RELATIVE_NONE
)
)))
{
-
$receipt['error'][]=array('msg'=>lang('failed to create directory') . ' :'.
$this->fakebase. SEP . $this->category_name . SEP . $loc1);
+
$receipt['error'][]=array('msg'=>lang('failed to create directory') . ' :'.
$this->fakebase. '/' . $this->category_name . '/' . $loc1);
}
else
{
-
$receipt['message'][]=array('msg'=>lang('directory created') . ' :'.
$this->fakebase. SEP . $this->category_name . SEP . $loc1);
+
$receipt['message'][]=array('msg'=>lang('directory created') . ' :'.
$this->fakebase. '/' . $this->category_name . '/' . $loc1);
}
$this->vfs->override_acl = 0;
}
if(!$this->vfs->file_exists(array(
- 'string' => $this->fakebase. SEP .
$this->category_name . SEP . $loc1 . SEP . $id,
+ 'string' => $this->fakebase. '/' .
$this->category_name . '/' . $loc1 . '/' . $id,
'relatives' => Array(RELATIVE_NONE)
)))
{
$this->vfs->override_acl = 1;
if(!$this->vfs->mkdir (array(
- 'string' => $this->fakebase. SEP .
$this->category_name . SEP . $loc1 . SEP . $id,
+ 'string' => $this->fakebase. '/' .
$this->category_name . '/' . $loc1 . '/' . $id,
'relatives' => array(
RELATIVE_NONE
)
)))
{
-
$receipt['error'][]=array('msg'=>lang('failed to create directory') . ' :'.
$this->fakebase. SEP . $this->category_name . SEP . $loc1 . SEP . $id);
+
$receipt['error'][]=array('msg'=>lang('failed to create directory') . ' :'.
$this->fakebase. '/' . $this->category_name . '/' . $loc1 . '/' . $id);
}
else
{
-
$receipt['message'][]=array('msg'=>lang('directory created') . ' :'.
$this->fakebase. SEP . $this->category_name . SEP . $loc1 . SEP . $id);
+
$receipt['message'][]=array('msg'=>lang('directory created') . ' :'.
$this->fakebase. '/' . $this->category_name . '/' . $loc1 . '/' . $id);
}
$this->vfs->override_acl = 0;
}
@@ -527,7 +529,7 @@
{
for
($i=0;$i<count($values['delete_file']);$i++)
{
- $file = $this->fakebase. SEP .
$this->category_name . SEP . $location[0] . SEP . $values['id'] . SEP .
$values['delete_file'][$i];
+ $file = $this->fakebase. '/' .
$this->category_name . '/' . $location[0] . '/' . $values['id'] . '/' .
$values['delete_file'][$i];
if($this->vfs->file_exists(array(
'string' =>
$file,
@@ -543,11 +545,11 @@
)
)))
{
-
$receipt['error'][]=array('msg'=>lang('failed to delete file') . ' :'.
$this->fakebase. SEP . $this->category_name . SEP . $location[0]. SEP .
$values['id'] . SEP .$values['delete_file'][$i]);
+
$receipt['error'][]=array('msg'=>lang('failed to delete file') . ' :'.
$this->fakebase. '/' . $this->category_name . '/' . $location[0]. '/' .
$values['id'] . '/' .$values['delete_file'][$i]);
}
else
{
-
$receipt['message'][]=array('msg'=>lang('file deleted') . ' :'.
$this->fakebase. SEP . $this->category_name . SEP . $location[0]. SEP .
$values['id'] . SEP . $values['delete_file'][$i]);
+
$receipt['message'][]=array('msg'=>lang('file deleted') . ' :'.
$this->fakebase. '/' . $this->category_name . '/' . $location[0]. '/' .
$values['id'] . '/' . $values['delete_file'][$i]);
}
$this->vfs->override_acl = 0;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/class.boentity.php, 1.1.1.10,
nomail <=