holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added correct_attributes (), fixed dir () prototype

Browse Source
This commit is contained in:
zone 2001-06-05 06:32:30 +00:00
parent d1f3076f93
commit 303110b926
1 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
phpgwapi/inc/class.vfs_wip.inc.php
View File

@ -553,6 +553,7 @@ class vfs
else else
{ {
$query = $phpgw->db->query ("INSERT INTO phpgw_vfs SET owner_id='$this->working_id', createdby_id='$account_id', created=NOW(), size=0, deleteable='Y', app='$this->currentapp', directory='$p->fake_leading_dirs', name='$p->fake_name'"); $query = $phpgw->db->query ("INSERT INTO phpgw_vfs SET owner_id='$this->working_id', createdby_id='$account_id', created=NOW(), size=0, deleteable='Y', app='$this->currentapp', directory='$p->fake_leading_dirs', name='$p->fake_name'");
$this->correct_attributes ($p->fake_full_path, array (RELATIVE_NONE));
} }
if ($tr || $vr || $query) if ($tr || $vr || $query)
@ -602,13 +603,15 @@ class vfs
if ($this->file_exists ($to, array ($relatives[1]))) if ($this->file_exists ($to, array ($relatives[1])))
{ {
$phpgw->db->query ("UPDATE phpgw_vfs SET owner_id='$this->working_id', createdby_id='$account_id', created = NOW(), size='$size', mime_type='$record[mime_type]', deleteable='Y', comment='$record[comment]', app='$record[app]', directory='$t->fake_leading_dirs', name='$->fake_name' WHERE owner_id='$this->working_id' AND directory='$t->fake_leading_dirs' AND name='$t->fake_name'"); $phpgw->db->query ("UPDATE phpgw_vfs SET owner_id='$this->working_id', createdby_id='$account_id', created = NOW(), size='$size', mime_type='$record[mime_type]', deleteable='$record[deletable]', comment='$record[comment]', app='$record[app]', directory='$t->fake_leading_dirs', name='$t->fake_name' WHERE owner_id='$this->working_id' AND directory='$t->fake_leading_dirs' AND name='$t->fake_name'");
} }
else else
{ {
$phpgw->db->query ("INSERT INTO phpgw_vfs SET owner_id='$this->working_id', createdby_id='$account_id', created = NOW(), size='$size', deleteable='Y', comment='$record[comment]', app='$record[app]', directory='$t->fake_leading_dirs', name='$t->fake_name'"); $phpgw->db->query ("INSERT INTO phpgw_vfs SET owner_id='$this->working_id', createdby_id='$account_id', created = NOW(), size='$size', deleteable='$record[deleteable]', comment='$record[comment]', app='$record[app]', directory='$t->fake_leading_dirs', name='$t->fake_name'");
} }
$this->correct_attributes ($t->fake_full_path, array (RELATIVE_NONE));
return True; return True;
} }
} }
@ -678,6 +681,7 @@ class vfs
$this->delete ($t->fake_full_path, array (RELATIVE_NONE)); $this->delete ($t->fake_full_path, array (RELATIVE_NONE));
$query = $phpgw->db->query ("UPDATE phpgw_vfs SET name='$t->fake_name', directory='$t->fake_leading_dirs', modifiedby_id='$account_id', modified=NOW() WHERE directory='$f->fake_leading_dirs' AND name='$f->fake_name'"); $query = $phpgw->db->query ("UPDATE phpgw_vfs SET name='$t->fake_name', directory='$t->fake_leading_dirs', modifiedby_id='$account_id', modified=NOW() WHERE directory='$f->fake_leading_dirs' AND name='$f->fake_name'");
$this->correct_attributes ($t->fake_full_path, array (RELATIVE_NONE));
$rr = rename ($f->real_full_path, $t->real_full_path); $rr = rename ($f->real_full_path, $t->real_full_path);
} }
@ -693,6 +697,7 @@ class vfs
{ {
$newdir = ereg_replace ("^$f->fake_full_path", $t->fake_full_path, $entry["directory"]); $newdir = ereg_replace ("^$f->fake_full_path", $t->fake_full_path, $entry["directory"]);
$query = $phpgw->db->query ("UPDATE phpgw_vfs SET directory='$newdir' WHERE file_id='$entry[file_id]'"); $query = $phpgw->db->query ("UPDATE phpgw_vfs SET directory='$newdir' WHERE file_id='$entry[file_id]'");
$this->correct_attributes ("$newdir/$entry[name]", array (RELATIVE_NONE));
} }
} }
@ -819,7 +824,6 @@ class vfs
if (!mkdir ($p->real_full_path, 0770)) if (!mkdir ($p->real_full_path, 0770))
{ {
echo "Couldn't make real dir";
return False; return False;
} }
else else
@ -827,6 +831,8 @@ class vfs
if (!$this->file_exists ($p->fake_leading_dirs . "/" . $dir, array (RELATIVE_NONE))) if (!$this->file_exists ($p->fake_leading_dirs . "/" . $dir, array (RELATIVE_NONE)))
{ {
$query = $phpgw->db->query ("INSERT INTO phpgw_vfs SET owner_id='$this->working_id', createdby_id='" . $phpgw_info["user"]["account_id"] . "', name='$p->fake_name', size=1024, mime_type='Directory', created=NOW(), modified='', deleteable='Y', app='$currentapp', directory='$p->fake_leading_dirs'"); $query = $phpgw->db->query ("INSERT INTO phpgw_vfs SET owner_id='$this->working_id', createdby_id='" . $phpgw_info["user"]["account_id"] . "', name='$p->fake_name', size=1024, mime_type='Directory', created=NOW(), modified='', deleteable='Y', app='$currentapp', directory='$p->fake_leading_dirs'");
$this->correct_attributes ($p->fake_full_path, array (RELATIVE_NONE));
} }
else else
{ {
@ -904,6 +910,41 @@ class vfs
} }
} }
/*!
@function correct_attributes
@abstract Set the correct attributes for $string (e.g. owner)
@param $string File/directory to correct attributes of
@param $relatives Relativity array
@result Boolean True/False
*/
function correct_attributes ($string, $relatives = array (RELATIVE_CURRENT))
{
global $phpgw;
$p = $this->path_parts ($string, array ($relatives[0]));
if ($p->fake_leading_dirs != $fakebase && $p->fake_leading_dirs != "/")
{
$ls_array = $this->ls ($p->fake_leading_dirs, array (RELATIVE_NONE), False, False, True);
$this->set_attributes ($p->fake_full_path, array ("owner_id" => $ls_array["owner_id"]), array (RELATIVE_NONE));
return True;
}
elseif (preg_match ("+^$fakebase\/(.*)$+U", $p->fake_full_path, $matches))
{
$this->set_attributes ($p->fake_full_path, array ("owner_id" => $matches[1]), array (RELATIVE_NONE));
return True;
}
else
{
$this->set_attributes ($p->fake_full_name, array ("owner_id" => 0), array (RELATIVE_NONE));
return True;
}
}
/*! /*!
@function file_type @function file_type
@abstract return file/dir type (MIME or other) @abstract return file/dir type (MIME or other)
@ -1065,8 +1106,8 @@ class vfs
@abstract shortcut to ls @abstract shortcut to ls
*/ */
function dir ($dir = False, $relatives = array (RELATIVE_CURRENT), $checksubdirs = True, $mime_type = False) function dir ($dir = False, $relatives = array (RELATIVE_CURRENT), $checksubdirs = True, $mime_type = False, $nofiles = False)
{ {
return $this->ls ($dir, $relatives, $checksubdirs, $mime_type); return $this->ls ($dir, $relatives, $checksubdirs, $mime_type, $nofiles);
} }
} }