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

useing the updated vfs_sql class from the API now

Browse Source
This commit is contained in:
Ralf Becker 2004-02-08 22:31:31 +00:00
parent 15cd1353e1
commit 348770c1cd
3 changed files with 68 additions and 2592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infolog/inc/class.boinfolog.inc.php
View File

@ -71,7 +71,6 @@
)); ));
$this->so = CreateObject('infolog.soinfolog'); $this->so = CreateObject('infolog.soinfolog');
$this->vfs = CreateObject('infolog.vfs');
$this->link = CreateObject('infolog.bolink'); $this->link = CreateObject('infolog.bolink');
$this->config = CreateObject('phpgwapi.config'); $this->config = CreateObject('phpgwapi.config');

94
infolog/inc/class.bolink.inc.php
View File

@ -101,7 +101,8 @@
'view' => True, 'view' => True,
'get_file' => True 'get_file' => True
); );
$this->vfs = CreateObject('infolog.vfs'); //$this->vfs = CreateObject('infolog.vfs');
$this->vfs = CreateObject('phpgwapi.vfs');
$config = CreateObject('phpgwapi.config'); $config = CreateObject('phpgwapi.config');
$config->read_repository(); $config->read_repository();
@ -516,7 +517,7 @@
@discussion All link-files are based in the vfs-subdir 'infolog'. For other apps @discussion All link-files are based in the vfs-subdir 'infolog'. For other apps
@discussion separate subdirs with name app are created. @discussion separate subdirs with name app are created.
*/ */
function vfs_path($app,$id='',$file='') function vfs_path($app,$id='',$file='',$relatives=False)
{ {
$path = $this->vfs_basedir . ($app == '' || $app == 'infolog' ? '' : '/'.$app) . $path = $this->vfs_basedir . ($app == '' || $app == 'infolog' ? '' : '/'.$app) .
($id != '' ? '/' . $id : '') . ($file != '' ? '/' . $file : ''); ($id != '' ? '/' . $id : '') . ($file != '' ? '/' . $file : '');
@ -525,7 +526,10 @@
{ {
echo "<p>bolink::vfs_path('$app','$id','$file') = '$path'</p>\n"; echo "<p>bolink::vfs_path('$app','$id','$file') = '$path'</p>\n";
} }
return $path; return $relatives ? array(
'string' => $path,
'relatives' => is_array($relatives) ? $relatives : array($relatives)
) : $path;
} }
/*! /*!
@ -548,25 +552,34 @@
echo "<p>attach_file: app='$app', id='$id', tmp_name='$file[tmp_name]', name='$file[name]', size='$file[size]', type='$file[type]', path='$file[path]', ip='$file[ip]', comment='$comment'</p>\n"; echo "<p>attach_file: app='$app', id='$id', tmp_name='$file[tmp_name]', name='$file[name]', size='$file[size]', type='$file[type]', path='$file[path]', ip='$file[ip]', comment='$comment'</p>\n";
} }
// create the root for attached files in infolog, if it does not exists // create the root for attached files in infolog, if it does not exists
if (!($this->vfs->file_exists($this->vfs_basedir,array(RELATIVE_ROOT)))) //if (!($this->vfs->file_exists($this->vfs_basedir,array(RELATIVE_ROOT))))
$vfs_data = array('string'=>$this->vfs_basedir,'relatives'=>array(RELATIVE_ROOT));
if (!($this->vfs->file_exists($vfs_data)))
{ {
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
$this->vfs->mkdir($this->vfs_basedir,array(RELATIVE_ROOT)); //$this->vfs->mkdir($this->vfs_basedir,array(RELATIVE_ROOT));
$this->vfs->mkdir($vfs_data);
$this->vfs->override_acl = 0; $this->vfs->override_acl = 0;
} }
$dir=$this->vfs_path($app); //$dir=$this->vfs_path($app);
if (!($this->vfs->file_exists($dir,array(RELATIVE_ROOT)))) //if (!($this->vfs->file_exists($dir,array(RELATIVE_ROOT))))
$vfs_data = $this->vfs_path($app,False,False,RELATIVE_ROOT);
if (!($this->vfs->file_exists($vfs_data)))
{ {
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
$this->vfs->mkdir($dir,array(RELATIVE_ROOT)); //$this->vfs->mkdir($dir,array(RELATIVE_ROOT));
$this->vfs->mkdir($vfs_data);
$this->vfs->override_acl = 0; $this->vfs->override_acl = 0;
} }
$dir=$this->vfs_path($app,$id); //$dir=$this->vfs_path($app,$id);
if (!($this->vfs->file_exists($dir,array(RELATIVE_ROOT)))) //if (!($this->vfs->file_exists($dir,array(RELATIVE_ROOT))))
$vfs_data = $this->vfs_path($app,$id,False,RELATIVE_ROOT);
if (!($this->vfs->file_exists($vfs_data)))
{ {
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
$this->vfs->mkdir($dir,array(RELATIVE_ROOT)); //$this->vfs->mkdir($dir,array(RELATIVE_ROOT));
$this->vfs->mkdir($vfs_data);
$this->vfs->override_acl = 0; $this->vfs->override_acl = 0;
} }
$fname = $this->vfs_path($app,$id,$file['name']); $fname = $this->vfs_path($app,$id,$file['name']);
@ -582,18 +595,21 @@
//echo "<p>attach_file: ereg('".$this->send_file_ips[$valid]."', '$file[ip]')=".ereg($this->send_file_ips[$valid],$file['ip'])."</p>\n"; //echo "<p>attach_file: ereg('".$this->send_file_ips[$valid]."', '$file[ip]')=".ereg($this->send_file_ips[$valid],$file['ip'])."</p>\n";
if ($check('^('.$valid2.')(.*)$',$file['path'],$parts) && if ($check('^('.$valid2.')(.*)$',$file['path'],$parts) &&
ereg($this->send_file_ips[$valid],$file['ip']) && // right IP ereg($this->send_file_ips[$valid],$file['ip']) && // right IP
$this->vfs->file_exists($trans.$parts[2],array(RELATIVE_NONE|VFS_REAL))) // $this->vfs->file_exists($trans.$parts[2],array(RELATIVE_NONE|VFS_REAL)))
$this->vfs->file_exists(array('string'=>$trans.$parts[2],'relatives'=>array(RELATIVE_NONE|VFS_REAL))))
{ {
$tfname = $trans.$parts[2]; $tfname = $trans.$parts[2];
} }
//echo "<p>attach_file: full_fname='$file[path]', valid2='$valid2', trans='$trans', check=$check, tfname='$tfname', parts=(x,'${parts[1]}','${parts[2]}')</p>\n"; //echo "<p>attach_file: full_fname='$file[path]', valid2='$valid2', trans='$trans', check=$check, tfname='$tfname', parts=(x,'${parts[1]}','${parts[2]}')</p>\n";
} }
if ($tfname && !$this->vfs->securitycheck($tfname)) //if ($tfname && !$this->vfs->securitycheck($tfname))
if ($tfname && !$this->vfs->securitycheck(array('string'=>$tfname)))
{ {
return False; //lang('Invalid filename').': '.$tfname; return False; //lang('Invalid filename').': '.$tfname;
} }
} }
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
/*
if ($tfname) // file is local if ($tfname) // file is local
{ {
$this->vfs->symlink($tfname,$fname,array(RELATIVE_NONE|VFS_REAL,RELATIVE_ROOT)); $this->vfs->symlink($tfname,$fname,array(RELATIVE_NONE|VFS_REAL,RELATIVE_ROOT));
@ -606,6 +622,21 @@
array ('mime_type' => $file['type'], array ('mime_type' => $file['type'],
'comment' => stripslashes ($comment), 'comment' => stripslashes ($comment),
'app' => $app)); 'app' => $app));
*/
$this->vfs->cp(array(
'symlink' => !!$tfname, // try a symlink
'from' => $tfname ? $tfname : $file['tmp_name'],
'to' => $fname,
'relatives' => array(RELATIVE_NONE|VFS_REAL,RELATIVE_ROOT),
));
$this->vfs->set_attributes(array(
'string' => $fname,
'relatives' => array (RELATIVE_ROOT),
'attributes' => array (
'mime_type' => $file['type'],
'comment' => stripslashes ($comment),
'app' => $app
)));
$this->vfs->override_acl = 0; $this->vfs->override_acl = 0;
$link = $this->info_attached($app,$id,$file['name']); $link = $this->info_attached($app,$id,$file['name']);
@ -637,12 +668,14 @@
{ {
return False; // dont delete more than all attachments of an entry return False; // dont delete more than all attachments of an entry
} }
$file = $this->vfs_path($app,$id,$fname); //$file = $this->vfs_path($app,$id,$fname);
//if ($this->vfs->file_exists($file,array(RELATIVE_ROOT)))
if ($this->vfs->file_exists($file,array(RELATIVE_ROOT))) $vfs_data = $this->vfs_path($app,$id,$fname,RELATIVE_ROOT);
if ($this->vfs->file_exists($vfs_data))
{ {
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
$Ok = $this->vfs->delete($file,array(RELATIVE_ROOT)); //$Ok = $this->vfs->delete($file,array(RELATIVE_ROOT));
$Ok = $this->vfs->delete($vfs_data);
$this->vfs->override_acl = 0; $this->vfs->override_acl = 0;
return $Ok; return $Ok;
} }
@ -661,7 +694,8 @@
function info_attached($app,$id,$filename) function info_attached($app,$id,$filename)
{ {
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
$attachments = $this->vfs->ls($this->vfs_path($app,$id,$filename),array(REALTIVE_NONE)); //$attachments = $this->vfs->ls($this->vfs_path($app,$id,$filename),array(RELATIVE_NONE));
$attachments = $this->vfs->ls($this->vfs_path($app,$id,$filename,RELATIVE_NONE));
$this->vfs->override_acl = 0; $this->vfs->override_acl = 0;
if (!count($attachments) || !$attachments[0]['name']) if (!count($attachments) || !$attachments[0]['name'])
@ -684,8 +718,9 @@
{ {
if (!is_array($fileinfo)) if (!is_array($fileinfo))
{ {
$fileinfo = $this->vfs->fileinfo($fileinfo); //$fileinfo = $this->vfs->fileinfo($fileinfo);
list(,$fileinfo) = each($fileinfo); $fileinfo = $this->vfs->ls(array('file_id' => $fileinfo));
list(,$fileinfo) = each($fileinfo);
if (!is_array($fileinfo)) if (!is_array($fileinfo))
{ {
@ -722,14 +757,15 @@
function list_attached($app,$id) function list_attached($app,$id)
{ {
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
$attachments = $this->vfs->ls($this->vfs_path($app,$id),array(REALTIVE_NONE)); //$attachments = $this->vfs->ls($this->vfs_path($app,$id),array(RELATIVE_NONE));
$attachments = $this->vfs->ls($this->vfs_path($app,$id,False,RELATIVE_ROOT));
$this->vfs->override_acl = 0; $this->vfs->override_acl = 0;
if (!count($attachments) || !$attachments[0]['name']) if (!count($attachments) || !$attachments[0]['name'])
{ {
return False; return False;
} }
while (list(,$fileinfo) = each($attachments)) foreach($attachments as $fileinfo)
{ {
$link = $this->fileinfo2link($fileinfo); $link = $this->fileinfo2link($fileinfo);
$attached[$link['link_id']] = $link; $attached[$link['link_id']] = $link;
@ -761,7 +797,10 @@
return False; return False;
} }
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
return $this->vfs->read($this->vfs_path($app,$id,$filename),array(RELATIVE_ROOT)); // $data = $this->vfs->read($this->vfs_path($app,$id,$filename),array(RELATIVE_ROOT));
$data = $this->vfs->read($this->vfs_path($app,$id,$filename,RELATIVE_ROOT));
$this->vfs->override_acl = 0;
return $data;
} }
/*! /*!
@ -780,7 +819,9 @@
{ {
return False; return False;
} }
$link = $this->vfs->readlink ($this->vfs_path($app,$id,$filename), array (RELATIVE_ROOT)); //$link = $this->vfs->readlink ($this->vfs_path($app,$id,$filename), array (RELATIVE_ROOT));
$link = $this->vfs->ls($this->vfs_path($app,$id,$filename,RELATIVE_ROOT)+array('readlink'=>True));
$link = @$link[0]['symlink'];
if ($link && is_array($this->link_pathes)) if ($link && is_array($this->link_pathes))
{ {
@ -788,14 +829,15 @@
while ((list($valid,$trans) = each($this->link_pathes)) && !$fname) while ((list($valid,$trans) = each($this->link_pathes)) && !$fname)
{ {
if (!$this->is_win_path($valid) == !$win_user && // valid for this OS if (!$this->is_win_path($valid) == !$win_user && // valid for this OS
eregi('^'.$trans.'(.*)$',$link,$parts) && // right path $win_user && // only for IE/windows atm
eregi('^'.$trans.'(.*)$',$link,$parts) && // right path
ereg($this->send_file_ips[$valid],$ip)) // right IP ereg($this->send_file_ips[$valid],$ip)) // right IP
{ {
$fname = $valid . $parts[1]; $fname = $valid . $parts[1];
$fname = !$win_user ? str_replace('\\','/',$fname) : str_replace('/','\\',$fname); $fname = !$win_user ? str_replace('\\','/',$fname) : str_replace('/','\\',$fname);
return 'file:'.($win_user ? '//' : '' ).$fname; return 'file:'.($win_user ? '//' : '' ).$fname;
} }
// echo "<p>attached_local: link=$link, valid=$valid, trans='$trans', fname='$fname', parts=(x,'${parts[1]}','${parts[2]}')</p>\n"; //echo "<p>attached_local: link=$link, valid=$valid, trans='$trans', fname='$fname', parts=(x,'${parts[1]}','${parts[2]}')</p>\n";
} }
} }
return False; return False;

2565
infolog/inc/class.vfs.inc.php
View File

File diff suppressed because it is too large Load Diff