mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't use depricated OC_Filesystem

This commit is contained in:
Robin Appelman 2012-10-10 13:18:36 +02:00
parent c88c54bbb0
commit aaa1b73364
32 changed files with 209 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/ajax/autocomplete.php
View File

@ -33,8 +33,8 @@ $query=strtolower($query);
$files=array();
if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
$dh = OC_Filesystem::opendir($base);
if(\OC\Files\Filesystem::file_exists($base) and \OC\Files\Filesystem::is_dir($base)) {
$dh = \OC\Files\Filesystem::opendir($base);
if($dh) {
if(substr($base, -1, 1)!='/') {
$base=$base.'/';
@ -43,7 +43,7 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
if ($file != "." && $file != "..") {
if(substr(strtolower($file), 0, $queryLen)==$query) {
$item=$base.$file;
if((!$dirOnly or OC_Filesystem::is_dir($item))) {
if((!$dirOnly or \OC\Files\Filesystem::is_dir($item))) {
$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
}
}

6
apps/files/ajax/newfile.php
View File

@ -63,12 +63,12 @@ if($source) {
$ctx = stream_context_create(null, array('notification' =>'progress'));
$sourceStream=fopen($source, 'rb', false, $ctx);
$target=$dir.'/'.$filename;
$result=OC_Filesystem::file_put_contents($target, $sourceStream);
$result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
if($result) {
$meta = OC_FileCache::get($target);
$mime=$meta['mimetype'];
$id = OC_FileCache::getId($target);
$eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target), 'id' => $id));
$eventSource->send('success', array('mime'=>$mime, 'size'=>\OC\Files\Filesystem::filesize($target), 'id' => $id));
} else {
$eventSource->send('error', "Error while downloading ".$source. ' to '.$target);
}
@ -76,7 +76,7 @@ if($source) {
exit();
} else {
if($content) {
if(OC_Filesystem::file_put_contents($dir.'/'.$filename, $content)) {
if(\OC\Files\Filesystem::file_put_contents($dir.'/'.$filename, $content)) {
$meta = OC_FileCache::get($dir.'/'.$filename);
$id = OC_FileCache::getId($dir.'/'.$filename);
OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));

4
apps/files/ajax/upload.php
View File

@ -38,7 +38,7 @@ $totalSize=0;
foreach($files['size'] as $size) {
$totalSize+=$size;
}
if($totalSize>OC_Filesystem::free_space('/')) {
if($totalSize>\OC\Files\Filesystem::free_space('/')) {
OCP\JSON::error(array("data" => array( "message" => "Not enough space available" )));
exit();
}
@ -48,7 +48,7 @@ if(strpos($dir, '..') === false) {
$fileCount=count($files['name']);
for($i=0;$i<$fileCount;$i++) {
$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
if(is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
$meta = OC_FileCache::get($target);
$id = OC_FileCache::getId($target);
$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target));

4
apps/files/appinfo/filesync.php
View File

@ -43,7 +43,7 @@ if ($type != 'oc_chunked') {
die;
}
if (!OC_Filesystem::is_file($file)) {
if (!\OC\Files\Filesystem::is_file($file)) {
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
die;
}
@ -51,7 +51,7 @@ if (!OC_Filesystem::is_file($file)) {
switch($_SERVER['REQUEST_METHOD']) {
case 'PUT':
$input = fopen("php://input", "r");
$org_file = OC_Filesystem::fopen($file, 'rb');
$org_file = \OC\Files\Filesystem::fopen($file, 'rb');
$info = array(
'name' => basename($file),
);

8
apps/files/download.php
View File

@ -29,7 +29,7 @@ OCP\User::checkLoggedIn();
$filename = $_GET["file"];
if(!OC_Filesystem::file_exists($filename)) {
if(!\OC\Files\Filesystem::file_exists($filename)) {
header("HTTP/1.0 404 Not Found");
$tmpl = new OCP\Template( '', '404', 'guest' );
$tmpl->assign('file',$filename);
@ -37,12 +37,12 @@ if(!OC_Filesystem::file_exists($filename)) {
exit;
}
$ftype=OC_Filesystem::getMimeType( $filename );
$ftype=\OC\Files\Filesystem::getMimeType( $filename );
header('Content-Type:'.$ftype);
header('Content-Disposition: attachment; filename="'.basename($filename).'"');
OCP\Response::disableCaching();
header('Content-Length: '.OC_Filesystem::filesize($filename));
header('Content-Length: '.\OC\Files\Filesystem::filesize($filename));
@ob_end_clean();
OC_Filesystem::readfile( $filename );
\OC\Files\Filesystem::readfile( $filename );

14
apps/files/index.php
View File

@ -38,7 +38,7 @@ OCP\App::setActiveNavigationEntry( 'files_index' );
// Load the files
$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
// Redirect if directory does not exist
if(!OC_Filesystem::is_dir($dir.'/')) {
if(!\OC\Files\Filesystem::is_dir($dir.'/')) {
header('Location: '.$_SERVER['SCRIPT_NAME'].'');
exit();
}
@ -85,26 +85,26 @@ $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
$freeSpace=OC_Filesystem::free_space('/');
$freeSpace=\OC\Files\Filesystem::free_space('/');
$freeSpace=max($freeSpace,0);
$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
$permissions = OCP\Share::PERMISSION_READ;
if (OC_Filesystem::isUpdatable($dir.'/')) {
if (\OC\Files\Filesystem::isUpdatable($dir.'/')) {
$permissions |= OCP\Share::PERMISSION_UPDATE;
}
if (OC_Filesystem::isDeletable($dir.'/')) {
if (\OC\Files\Filesystem::isDeletable($dir.'/')) {
$permissions |= OCP\Share::PERMISSION_DELETE;
}
if (OC_Filesystem::isSharable($dir.'/')) {
if (\OC\Files\Filesystem::isSharable($dir.'/')) {
$permissions |= OCP\Share::PERMISSION_SHARE;
}
$tmpl = new OCP\Template( 'files', 'index', 'user' );
$tmpl->assign( 'fileList', $list->fetchPage(), false );
$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
$tmpl->assign( 'dir', OC_Filesystem::normalizePath($dir));
$tmpl->assign( 'isCreatable', OC_Filesystem::isCreatable($dir.'/'));
$tmpl->assign( 'dir', \OC\Files\Filesystem::normalizePath($dir));
$tmpl->assign( 'isCreatable', \OC\Files\Filesystem::isCreatable($dir.'/'));
$tmpl->assign('permissions', $permissions);
$tmpl->assign( 'files', $files );
$tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);

6
apps/files_encryption/lib/crypt.php
View File

@ -44,7 +44,7 @@ class OC_Crypt {
}
public static function init($login,$password) {
$view=new OC_FilesystemView('/');
$view=new \OC\Files\View('/');
if(!$view->file_exists('/'.$login)) {
$view->mkdir('/'.$login);
}
@ -90,7 +90,7 @@ class OC_Crypt {
// Write the file
$proxyEnabled=OC_FileProxy::$enabled;
OC_FileProxy::$enabled=false;
$view=new OC_FilesystemView('/'.$username);
$view=new \OC\Files\View('/'.$username);
$view->file_put_contents('/encryption.key',$enckey);
OC_FileProxy::$enabled=$proxyEnabled;
}
@ -98,7 +98,7 @@ class OC_Crypt {
public static function changekeypasscode($oldPassword, $newPassword) {
if(OCP\User::isLoggedIn()) {
$username=OCP\USER::getUser();
$view=new OC_FilesystemView('/'.$username);
$view=new \OC\Files\View('/'.$username);
// read old key
$key=$view->file_get_contents('/encryption.key');

2
apps/files_encryption/lib/cryptstream.php
View File

@ -38,7 +38,7 @@ class OC_CryptStream{
public function stream_open($path, $mode, $options, &$opened_path) {
if(!self::$rootView) {
self::$rootView=new OC_FilesystemView('');
self::$rootView=new \OC\Files\View('');
}
$path=str_replace('crypt://','',$path);
if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {

6
apps/files_encryption/lib/proxy.php
View File

@ -90,13 +90,13 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
fclose($result);
$result=fopen('crypt://'.$path,$meta['mode']);
}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
if(\OC\Files\Filesystem::file_exists($path) and \OC\Files\Filesystem::filesize($path)>0) {
//first encrypt the target file so we don't end up with a half encrypted file
OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing',OCP\Util::DEBUG);
$tmp=fopen('php://temp');
$tmp=fopen('php://temp', 'w+');
OCP\Files::streamCopy($result,$tmp);
fclose($result);
OC_Filesystem::file_put_contents($path,$tmp);
\OC\Files\Filesystem::file_put_contents($path,$tmp);
fclose($tmp);
}
$result=fopen('crypt://'.$path,$meta['mode']);

30
apps/files_encryption/tests/proxy.php
View File

@ -29,13 +29,13 @@ class Test_CryptProxy extends UnitTestCase {
OC_FileProxy::register(new OC_FileProxy_Encryption());
//set up temporary storage
OC_Filesystem::clearMounts();
OC_Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/');
\OC\Files\Filesystem::clearMounts();
\OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/');
OC_Filesystem::init('/'.$user.'/files');
\OC\Files\Filesystem::init('/'.$user.'/files');
//set up the users home folder in the temp storage
$rootView=new OC_FilesystemView('');
$rootView=new \OC\Files\View('');
$rootView->mkdir('/'.$user);
$rootView->mkdir('/'.$user.'/files');
}
@ -51,13 +51,13 @@ class Test_CryptProxy extends UnitTestCase {
$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
$original=file_get_contents($file);
OC_Filesystem::file_put_contents('/file',$original);
\OC\Files\Filesystem::file_put_contents('/file',$original);
OC_FileProxy::$enabled=false;
$stored=OC_Filesystem::file_get_contents('/file');
$stored=\OC\Files\Filesystem::file_get_contents('/file');
OC_FileProxy::$enabled=true;
$fromFile=OC_Filesystem::file_get_contents('/file');
$fromFile=\OC\Files\Filesystem::file_get_contents('/file');
$this->assertNotEqual($original,$stored);
$this->assertEqual(strlen($original),strlen($fromFile));
$this->assertEqual($original,$fromFile);
@ -68,8 +68,8 @@ class Test_CryptProxy extends UnitTestCase {
$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
$original=file_get_contents($file);
$rootView=new OC_FilesystemView('');
$view=new OC_FilesystemView('/'.OC_User::getUser());
$rootView=new \OC\Files\View('');
$view=new \OC\Files\View('/'.OC_User::getUser());
$userDir='/'.OC_User::getUser().'/files';
$rootView->file_put_contents($userDir.'/file',$original);
@ -90,13 +90,13 @@ class Test_CryptProxy extends UnitTestCase {
$file=__DIR__.'/binary';
$original=file_get_contents($file);
OC_Filesystem::file_put_contents('/file',$original);
\OC\Files\Filesystem::file_put_contents('/file',$original);
OC_FileProxy::$enabled=false;
$stored=OC_Filesystem::file_get_contents('/file');
$stored=\OC\Files\Filesystem::file_get_contents('/file');
OC_FileProxy::$enabled=true;
$fromFile=OC_Filesystem::file_get_contents('/file');
$fromFile=\OC\Files\Filesystem::file_get_contents('/file');
$this->assertNotEqual($original,$stored);
$this->assertEqual(strlen($original),strlen($fromFile));
$this->assertEqual($original,$fromFile);
@ -104,13 +104,13 @@ class Test_CryptProxy extends UnitTestCase {
$file=__DIR__.'/zeros';
$original=file_get_contents($file);
OC_Filesystem::file_put_contents('/file',$original);
\OC\Files\Filesystem::file_put_contents('/file',$original);
OC_FileProxy::$enabled=false;
$stored=OC_Filesystem::file_get_contents('/file');
$stored=\OC\Files\Filesystem::file_get_contents('/file');
OC_FileProxy::$enabled=true;
$fromFile=OC_Filesystem::file_get_contents('/file');
$fromFile=\OC\Files\Filesystem::file_get_contents('/file');
$this->assertNotEqual($original,$stored);
$this->assertEqual(strlen($original),strlen($fromFile));
}

12
apps/files_external/ajax/addRootCertificate.php
View File

@ -3,23 +3,23 @@
OCP\JSON::checkAppEnabled('files_external');
if ( !($filename = $_FILES['rootcert_import']['name']) ) {
header("Location: settings/personal.php");
header("Location: settings/personal.php");
exit;
}
$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
fclose($fh);
$filename = $_FILES['rootcert_import']['name'];
$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_external/uploads');
$view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_external/uploads');
if (!$view->file_exists('')) $view->mkdir('');
$isValid = openssl_pkey_get_public($data);
//maybe it was just the wrong file format, try to convert it...
if ($isValid == false) {
$data = chunk_split(base64_encode($data), 64, "\n");
$data = chunk_split(base64_encode($data), 64, "\n");
$data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n";
$isValid = openssl_pkey_get_public($data);
}

12
apps/files_external/lib/config.php
View File

@ -109,10 +109,10 @@ class OC_Mount_Config {
return $personal;
}
/**
* Add directory for mount point to the filesystem
* @param OC_Fileview instance $view
* @param string path to mount point
/**
* Add directory for mount point to the filesystem
* @param OC_Fileview instance $view
* @param string path to mount point
*/
private static function addMountPointDirectory($view, $path) {
$dir = '';
@ -142,11 +142,11 @@ class OC_Mount_Config {
if ($applicable != OCP\User::getUser() || $class == '\OC\Files\Storage\Local') {
return false;
}
$view = new OC_FilesystemView('/'.OCP\User::getUser().'/files');
$view = new \OC\Files\View('/'.OCP\User::getUser().'/files');
self::addMountPointDirectory($view, ltrim($mountPoint, '/'));
$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
} else {
$view = new OC_FilesystemView('/');
$view = new \OC\Files\View('/');
switch ($mountType) {
case 'user':
if ($applicable == "all") {

66
apps/files_sharing/lib/sharedstorage.php
View File

@ -80,7 +80,7 @@ class Shared extends \OC\Files\Storage\Common {
$file = $this->getFile($target);
if (isset($file['path'])) {
$uid = substr($file['path'], 1, strpos($file['path'], '/', 1) - 1);
\OC_Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => \OC_User::getHome($uid)), $uid);
\\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => \OC_User::getHome($uid)), $uid);
return $file['path'];
}
return false;
@ -105,7 +105,7 @@ class Shared extends \OC\Files\Storage\Common {
* @return Source file path with mount point stripped out
*/
private function getInternalPath($path) {
$mountPoint = \OC_Filesystem::getMountPoint($path);
$mountPoint = \OC\Files\Filesystem::getMountPoint($path);
$internalPath = substr($path, strlen($mountPoint));
return $internalPath;
}
@ -114,7 +114,7 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) {
return false;
} else if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->mkdir($this->getInternalPath($source));
}
return false;
@ -122,7 +122,7 @@ class Shared extends \OC\Files\Storage\Common {
public function rmdir($path) {
if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->rmdir($this->getInternalPath($source));
}
return false;
@ -130,11 +130,11 @@ class Shared extends \OC\Files\Storage\Common {
public function opendir($path) {
if ($path == '' || $path == '/') {
$files = OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_Folder::FORMAT_OPENDIR);
$files = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_Folder::FORMAT_OPENDIR);
\OC_FakeDirStream::$dirs['shared'] = $files;
return opendir('fakedir://shared');
} else if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->opendir($this->getInternalPath($source));
}
return false;
@ -144,7 +144,7 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '' || $path == '/') {
return true;
} else if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->is_dir($this->getInternalPath($source));
}
return false;
@ -152,7 +152,7 @@ class Shared extends \OC\Files\Storage\Common {
public function is_file($path) {
if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->is_file($this->getInternalPath($source));
}
return false;
@ -165,7 +165,7 @@ class Shared extends \OC\Files\Storage\Common {
$stat['ctime'] = $this->filectime($path);
return $stat;
} else if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->stat($this->getInternalPath($source));
}
return false;
@ -175,7 +175,7 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '' || $path == '/') {
return 'dir';
} else if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->filetype($this->getInternalPath($source));
}
return false;
@ -185,7 +185,7 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '' || $path == '/' || $this->is_dir($path)) {
return 0;
} else if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->filesize($this->getInternalPath($source));
}
return false;
@ -195,7 +195,7 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '') {
return false;
}
return ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE);
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_CREATE);
}
public function isReadable($path) {
@ -206,28 +206,28 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '') {
return false;
}
return ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE);
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_UPDATE);
}
public function isDeletable($path) {
if ($path == '') {
return true;
}
return ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE);
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_DELETE);
}
public function isSharable($path) {
if ($path == '') {
return false;
}
return ($this->getPermissions($path) & OCP\Share::PERMISSION_SHARE);
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_SHARE);
}
public function file_exists($path) {
if ($path == '' || $path == '/') {
return true;
} else if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->file_exists($this->getInternalPath($source));
}
return false;
@ -248,7 +248,7 @@ class Shared extends \OC\Files\Storage\Common {
} else {
$source = $this->getSourcePath($path);
if ($source) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->filectime($this->getInternalPath($source));
}
}
@ -269,7 +269,7 @@ class Shared extends \OC\Files\Storage\Common {
} else {
$source = $this->getSourcePath($path);
if ($source) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->filemtime($this->getInternalPath($source));
}
}
@ -282,8 +282,8 @@ class Shared extends \OC\Files\Storage\Common {
'target' => $this->sharedFolder.$path,
'source' => $source,
);
OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_get_contents', $info);
$storage = \OC_Filesystem::getStorage($source);
\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_get_contents', $info);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->file_get_contents($this->getInternalPath($source));
}
}
@ -298,8 +298,8 @@ class Shared extends \OC\Files\Storage\Common {
'target' => $this->sharedFolder.$path,
'source' => $source,
);
OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_put_contents', $info);
$storage = \OC_Filesystem::getStorage($source);
\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_put_contents', $info);
$storage = \OC\Files\Filesystem::getStorage($source);
$result = $storage->file_put_contents($this->getInternalPath($source), $data);
return $result;
}
@ -310,7 +310,7 @@ class Shared extends \OC\Files\Storage\Common {
// Delete the file if DELETE permission is granted
if ($source = $this->getSourcePath($path)) {
if ($this->isDeletable($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->unlink($this->getInternalPath($source));
} else if (dirname($path) == '/' || dirname($path) == '.') {
// Unshare the file from the user if in the root of the Shared folder
@ -319,7 +319,7 @@ class Shared extends \OC\Files\Storage\Common {
} else {
$itemType = 'file';
}
return OCP\Share::unshareFromSelf($itemType, $path);
return \OCP\Share::unshareFromSelf($itemType, $path);
}
}
return false;
@ -334,7 +334,7 @@ class Shared extends \OC\Files\Storage\Common {
if (dirname($path1) == dirname($path2)) {
// Rename the file if UPDATE permission is granted
if ($this->isUpdatable($path1)) {
$storage = \OC_Filesystem::getStorage($oldSource);
$storage = \OC\Files\Filesystem::getStorage($oldSource);
return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
}
} else {
@ -349,7 +349,7 @@ class Shared extends \OC\Files\Storage\Common {
return $this->unlink($path1);
}
} else {
$storage = \OC_Filesystem::getStorage($oldSource);
$storage = \OC\Files\Filesystem::getStorage($oldSource);
return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
}
}
@ -394,8 +394,8 @@ class Shared extends \OC\Files\Storage\Common {
'source' => $source,
'mode' => $mode,
);
OCP\Util::emitHook('\OC\Files\Storage\Shared', 'fopen', $info);
$storage = \OC_Filesystem::getStorage($source);
\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'fopen', $info);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->fopen($this->getInternalPath($source), $mode);
}
return false;
@ -406,7 +406,7 @@ class Shared extends \OC\Files\Storage\Common {
return 'httpd/unix-directory';
}
if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->getMimeType($this->getInternalPath($source));
}
return false;
@ -415,21 +415,21 @@ class Shared extends \OC\Files\Storage\Common {
public function free_space($path) {
$source = $this->getSourcePath($path);
if ($source) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->free_space($this->getInternalPath($source));
}
}
public function getLocalFile($path) {
if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->getLocalFile($this->getInternalPath($source));
}
return false;
}
public function touch($path, $mtime = null) {
if ($source = $this->getSourcePath($path)) {
$storage = \OC_Filesystem::getStorage($source);
$storage = \OC\Files\Filesystem::getStorage($source);
return $storage->touch($this->getInternalPath($source), $mtime);
}
return false;
@ -437,7 +437,7 @@ class Shared extends \OC\Files\Storage\Common {
public static function setup($options) {
$user_dir = $options['user_dir'];
\OC_Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
}
/**

8
apps/files_sharing/public.php
View File

@ -73,7 +73,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
if (isset($_GET['path'])) {
$path .= $_GET['path'];
$dir .= $_GET['path'];
if (!OC_Filesystem::file_exists($path)) {
if (!\OC\Files\Filesystem::file_exists($path)) {
header('HTTP/1.0 404 Not Found');
$tmpl = new OCP\Template('', '404', 'guest');
$tmpl->printPage();
@ -101,7 +101,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
$tmpl = new OCP\Template('files_sharing', 'public', 'base');
$tmpl->assign('owner', $uidOwner);
// Show file list
if (OC_Filesystem::is_dir($path)) {
if (\OC\Files\Filesystem::is_dir($path)) {
OCP\Util::addStyle('files', 'files');
OCP\Util::addScript('files', 'files');
OCP\Util::addScript('files', 'filelist');
@ -157,7 +157,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
$tmpl->assign('uidOwner', $uidOwner);
$tmpl->assign('dir', basename($dir));
$tmpl->assign('filename', basename($path));
$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
if (isset($_GET['path'])) {
$getPath = $_GET['path'];
@ -170,7 +170,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
$tmpl->assign('uidOwner', $uidOwner);
$tmpl->assign('dir', dirname($path));
$tmpl->assign('filename', basename($path));
$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
if ($type == 'file') {
$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.$_GET['file'].'&download');
} else {

4
apps/files_versions/lib/hooks.php
View File

@ -21,9 +21,9 @@ class Hooks {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
$versions = new Storage( new \OC_FilesystemView('') );
$versions = new Storage( new \OC\Files\View('') );
$path = $params[\OC_Filesystem::signal_param_path];
$path = $params[\OC\Files\Filesystem::signal_param_path];
if($path<>'') $versions->store( $path );

16
apps/files_versions/lib/versions.php
View File

@ -58,8 +58,8 @@ class Storage {
public function store($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
$files_view = new \OC_FilesystemView('/'.$uid.'/files');
$users_view = new \OC_FilesystemView('/'.$uid);
$files_view = new \OC\Files\View('/'.$uid.'/files');
$users_view = new \OC\Files\View('/'.$uid);
//check if source file already exist as version to avoid recursions.
// todo does this check work?
@ -94,7 +94,7 @@ class Storage {
// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
if ($uid == \OCP\User::getUser()) {
$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$matches=glob($versionsFolderName.'/'.$filename.'.v*');
sort($matches);
@ -127,7 +127,7 @@ class Storage {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
$users_view = new \OC_FilesystemView('/'.$uid);
$users_view = new \OC\Files\View('/'.$uid);
// rollback
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
@ -150,7 +150,7 @@ class Storage {
public static function isversioned($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
@ -178,7 +178,7 @@ class Storage {
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
list($uid, $filename) = self::getUidAndFilename($filename);
$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$versions = array();
@ -190,7 +190,7 @@ class Storage {
$i = 0;
$files_view = new \OC_FilesystemView('/'.$uid.'/files');
$files_view = new \OC\Files\View('/'.$uid.'/files');
$local_file = $files_view->getLocalFile($filename);
foreach( $matches as $ma ) {
@ -245,7 +245,7 @@ class Storage {
public static function expire($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');

10
lib/connector/sabre/directory.php
View File

@ -62,7 +62,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
}
} else {
$newPath = $this->path . '/' . $name;
OC_Filesystem::file_put_contents($newPath, $data);
\OC\Files\Filesystem::file_put_contents($newPath, $data);
return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
}
@ -78,7 +78,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
public function createDirectory($name) {
$newPath = $this->path . '/' . $name;
OC_Filesystem::mkdir($newPath);
\OC\Files\Filesystem::mkdir($newPath);
}
@ -154,7 +154,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
public function childExists($name) {
$path = $this->path . '/' . $name;
return OC_Filesystem::file_exists($path);
return \OC\Files\Filesystem::file_exists($path);
}
@ -167,7 +167,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
if ($this->path != "/Shared") {
foreach($this->getChildren() as $child) $child->delete();
OC_Filesystem::rmdir($this->path);
\OC\Files\Filesystem::rmdir($this->path);
}
}
@ -181,7 +181,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
$rootInfo=OC_FileCache_Cached::get('');
return array(
$rootInfo['size'],
OC_Filesystem::free_space()
\OC\Files\Filesystem::free_space()
);
}

10
lib/connector/sabre/file.php
View File

@ -45,7 +45,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
*/
public function put($data) {
OC_Filesystem::file_put_contents($this->path,$data);
\OC\Files\Filesystem::file_put_contents($this->path,$data);
return OC_Connector_Sabre_Node::getETagPropertyForPath($this->path);
}
@ -57,7 +57,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
*/
public function get() {
return OC_Filesystem::fopen($this->path,'rb');
return \OC\Files\Filesystem::fopen($this->path,'rb');
}
@ -68,7 +68,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
*/
public function delete() {
OC_Filesystem::unlink($this->path);
\OC\Files\Filesystem::unlink($this->path);
}
@ -107,7 +107,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
* @return string|null Returns null if the ETag can not effectively be determined
*/
static protected function createETag($path) {
return OC_Filesystem::hash('md5', $path);
return \OC\Files\Filesystem::hash('md5', $path);
}
/**
@ -122,7 +122,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
return $this->fileinfo_cache['mimetype'];
}
return OC_Filesystem::getMimeType($this->path);
return \OC\Files\Filesystem::getMimeType($this->path);
}
}

8
lib/connector/sabre/node.php
View File

@ -80,7 +80,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
$newPath = $parentPath . '/' . $newName;
$oldPath = $this->path;
OC_Filesystem::rename($this->path,$newPath);
\OC\Files\Filesystem::rename($this->path,$newPath);
$this->path = $newPath;
@ -99,9 +99,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
*/
protected function getFileinfoCache() {
if (!isset($this->fileinfo_cache)) {
if ($fileinfo_cache = OC_FileCache::get($this->path)) {
if ($fileinfo_cache = \OC\Files\Filesystem::get($this->path)) {
} else {
$fileinfo_cache = OC_Filesystem::stat($this->path);
$fileinfo_cache = \OC\Files\Filesystem::stat($this->path);
}
$this->fileinfo_cache = $fileinfo_cache;
@ -130,7 +130,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
* Even if the modification time is set to a custom value the access time is set to now.
*/
public function touch($mtime) {
OC_Filesystem::touch($this->path, $mtime);
\OC\Files\Filesystem::touch($this->path, $mtime);
}
/**

38
lib/filechunking.php
View File

@ -94,49 +94,49 @@ class OC_FileChunking {
}
public function file_assemble($path) {
$absolutePath = OC_Filesystem::normalizePath(OC_Filesystem::getView()->getAbsolutePath($path));
$absolutePath = \OC\Files\Filesystem::normalizePath(\OC\Files\Filesystem::getView()->getAbsolutePath($path));
$data = '';
// use file_put_contents as method because that best matches what this function does
if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) && OC_Filesystem::isValidPath($path)) {
$path = OC_Filesystem::getView()->getRelativePath($absolutePath);
$exists = OC_Filesystem::file_exists($path);
if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) && \OC\Files\Filesystem::isValidPath($path)) {
$path = \OC\Files\Filesystem::getView()->getRelativePath($absolutePath);
$exists = \OC\Files\Filesystem::file_exists($path);
$run = true;
if(!$exists) {
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_create,
\OC\Files\Filesystem::CLASSNAME,
\OC\Files\Filesystem::signal_create,
array(
OC_Filesystem::signal_param_path => $path,
OC_Filesystem::signal_param_run => &$run
\OC\Files\Filesystem::signal_param_path => $path,
\OC\Files\Filesystem::signal_param_run => &$run
)
);
}
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_write,
\OC\Files\Filesystem::CLASSNAME,
\OC\Files\Filesystem::signal_write,
array(
OC_Filesystem::signal_param_path => $path,
OC_Filesystem::signal_param_run => &$run
\OC\Files\Filesystem::signal_param_path => $path,
\OC\Files\Filesystem::signal_param_run => &$run
)
);
if(!$run) {
return false;
}
$target = OC_Filesystem::fopen($path, 'w');
$target = \OC\Files\Filesystem::fopen($path, 'w');
if($target) {
$count = $this->assemble($target);
fclose($target);
if(!$exists) {
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_post_create,
array( OC_Filesystem::signal_param_path => $path)
\OC\Files\Filesystem::CLASSNAME,
\OC\Files\Filesystem::signal_post_create,
array( \OC\Files\Filesystem::signal_param_path => $path)
);
}
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_post_write,
array( OC_Filesystem::signal_param_path => $path)
\OC\Files\Filesystem::CLASSNAME,
\OC\Files\Filesystem::signal_post_write,
array( \OC\Files\Filesystem::signal_param_path => $path)
);
OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
return $count > 0;

2
lib/fileproxy/quota.php
View File

@ -88,7 +88,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
public function preCopy($path1,$path2) {
if(!self::$rootView){
self::$rootView = new OC_FilesystemView('');
self::$rootView = new \OC\Files\View('');
}
return (self::$rootView->filesize($path1)<$this->getFreeSpace() or $this->getFreeSpace()==0);
}

54
lib/files.php
View File

@ -46,10 +46,10 @@ class OC_Files {
if ($path == '/Shared') {
list($info) = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
}else{
$info['size'] = OC_Filesystem::filesize($path);
$info['mtime'] = OC_Filesystem::filemtime($path);
$info['ctime'] = OC_Filesystem::filectime($path);
$info['mimetype'] = OC_Filesystem::getMimeType($path);
$info['size'] = \OC\Files\Filesystem::filesize($path);
$info['mtime'] = \OC\Files\Filesystem::filemtime($path);
$info['ctime'] = \OC\Files\Filesystem::filectime($path);
$info['mimetype'] = \OC\Files\Filesystem::getMimeType($path);
$info['encrypted'] = false;
$info['versioned'] = false;
}
@ -64,7 +64,7 @@ class OC_Files {
* @param dir $directory path under datadirectory
*/
public static function getDirectoryContent($directory, $mimetype_filter = '') {
$directory=OC_Filesystem::normalizePath($directory);
$directory=\OC\Files\Filesystem::normalizePath($directory);
if($directory=='/') {
$directory='';
}
@ -151,17 +151,17 @@ class OC_Files {
}
foreach($files as $file) {
$file=$dir.'/'.$file;
if(OC_Filesystem::is_file($file)) {
$tmpFile=OC_Filesystem::toTmpFile($file);
if(\OC\Files\Filesystem::is_file($file)) {
$tmpFile=OC_F\OC\Files\Filesystemilesystem::toTmpFile($file);
self::$tmpFiles[]=$tmpFile;
$zip->addFile($tmpFile,basename($file));
}elseif(OC_Filesystem::is_dir($file)) {
}elseif(\OC\Files\Filesystem::is_dir($file)) {
self::zipAddDir($file,$zip);
}
}
$zip->close();
set_time_limit($executionTime);
}elseif(OC_Filesystem::is_dir($dir.'/'.$files)) {
}elseif(\OC\Files\Filesystem::is_dir($dir.'/'.$files)) {
self::validateZipDownload($dir,$files);
$executionTime = intval(ini_get('max_execution_time'));
set_time_limit(0);
@ -179,7 +179,7 @@ class OC_Files {
$filename=$dir.'/'.$files;
}
@ob_end_clean();
if($zip or OC_Filesystem::is_readable($filename)) {
if($zip or \OC\Files\Filesystem::is_readable($filename)) {
header('Content-Disposition: attachment; filename="'.basename($filename).'"');
header('Content-Transfer-Encoding: binary');
OC_Response::disableCaching();
@ -188,9 +188,9 @@ class OC_Files {
header('Content-Type: application/zip');
header('Content-Length: ' . filesize($filename));
}else{
header('Content-Type: '.OC_Filesystem::getMimeType($filename));
header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
}
}elseif($zip or !OC_Filesystem::file_exists($filename)) {
}elseif($zip or !\OC\Files\Filesystem::file_exists($filename)) {
header("HTTP/1.0 404 Not Found");
$tmpl = new OC_Template( '', '404', 'guest' );
$tmpl->assign('file',$filename);
@ -201,7 +201,7 @@ class OC_Files {
}
if($only_header) {
if(!$zip)
header("Content-Length: ".OC_Filesystem::filesize($filename));
header("Content-Length: ".\OC\Files\Filesystem::filesize($filename));
return ;
}
if($zip) {
@ -215,7 +215,7 @@ class OC_Files {
}
unlink($filename);
}else{
OC_Filesystem::readfile($filename);
\OC\Files\Filesystem::readfile($filename);
}
foreach(self::$tmpFiles as $tmpFile) {
if(file_exists($tmpFile) and is_file($tmpFile)) {
@ -232,11 +232,11 @@ class OC_Files {
foreach($files as $file) {
$filename=$file['name'];
$file=$dir.'/'.$filename;
if(OC_Filesystem::is_file($file)) {
$tmpFile=OC_Filesystem::toTmpFile($file);
if(\OC\Files\Filesystem::is_file($file)) {
$tmpFile=\OC\Files\Filesystem::toTmpFile($file);
OC_Files::$tmpFiles[]=$tmpFile;
$zip->addFile($tmpFile,$internalDir.$filename);
}elseif(OC_Filesystem::is_dir($file)) {
}elseif(\OC\Files\Filesystem::is_dir($file)) {
self::zipAddDir($file,$zip,$internalDir);
}
}
@ -253,7 +253,7 @@ class OC_Files {
if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')) {
$targetFile=self::normalizePath($targetDir.'/'.$target);
$sourceFile=self::normalizePath($sourceDir.'/'.$source);
return OC_Filesystem::rename($sourceFile,$targetFile);
return \OC\Files\Filesystem::rename($sourceFile,$targetFile);
} else {
return false;
}
@ -271,7 +271,7 @@ class OC_Files {
if(OC_User::isLoggedIn()) {
$targetFile=$targetDir.'/'.$target;
$sourceFile=$sourceDir.'/'.$source;
return OC_Filesystem::copy($sourceFile,$targetFile);
return \OC\Files\Filesystem::copy($sourceFile,$targetFile);
}
}
@ -286,9 +286,9 @@ class OC_Files {
if(OC_User::isLoggedIn()) {
$file=$dir.'/'.$name;
if($type=='dir') {
return OC_Filesystem::mkdir($file);
return \OC\Files\Filesystem::mkdir($file);
}elseif($type=='file') {
$fileHandle=OC_Filesystem::fopen($file, 'w');
$fileHandle=\OC\Files\Filesystem::fopen($file, 'w');
if($fileHandle) {
fclose($fileHandle);
return true;
@ -308,7 +308,7 @@ class OC_Files {
public static function delete($dir,$file) {
if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) {
$file=$dir.'/'.$file;
return OC_Filesystem::unlink($file);
return \OC\Files\Filesystem::unlink($file);
}
}
@ -339,10 +339,10 @@ class OC_Files {
$totalsize = 0;
if(is_array($files)) {
foreach($files as $file) {
$totalsize += OC_Filesystem::filesize($dir.'/'.$file);
$totalsize += \OC\Files\Filesystem::filesize($dir.'/'.$file);
}
}else{
$totalsize += OC_Filesystem::filesize($dir.'/'.$files);
$totalsize += \OC\Files\Filesystem::filesize($dir.'/'.$files);
}
if($totalsize > $zipLimit) {
$l = OC_L10N::get('lib');
@ -368,7 +368,7 @@ class OC_Files {
* @return string guessed mime type
*/
static function getMimeType($path) {
return OC_Filesystem::getMimeType($path);
return \OC\Files\Filesystem::getMimeType($path);
}
/**
@ -378,7 +378,7 @@ class OC_Files {
* @return array
*/
static function getTree($path) {
return OC_Filesystem::getTree($path);
return \OC\Files\Filesystem::getTree($path);
}
/**
@ -402,7 +402,7 @@ class OC_Files {
$httpCode=$info['http_code'];
curl_close($ch);
if($httpCode==200 or $httpCode==0) {
OC_Filesystem::fromTmpFile($tmpfile,$dir.'/'.$file);
\OC\Files\Filesystem::fromTmpFile($tmpfile,$dir.'/'.$file);
return true;
}else{
return false;

2
lib/files/file.php
View File

@ -30,7 +30,7 @@ class File{
public static function resolve($fullPath){
$storage = null;
$internalPath = '';
list($storage, $internalPath) = \OC_Filesystem::resolvePath($fullPath);
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
return new File($storage, $internalPath);
}

2
lib/helper.php
View File

@ -560,7 +560,7 @@ class OC_Helper {
$newpath = $path . '/' . $filename;
$counter = 2;
while (OC_Filesystem::file_exists($newpath)) {
while (\OC\Files\Filesystem::file_exists($newpath)) {
$newname = $name . ' (' . $counter . ')' . $ext;
$newpath = $path . '/' . $newname;
$counter++;

2
lib/image.php
View File

@ -470,7 +470,7 @@ class OC_Image {
default:
// this is mostly file created from encrypted file
$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($imagepath)));
$this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagepath)));
$itype = IMAGETYPE_PNG;
OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
break;

4
lib/ocs.php
View File

@ -589,11 +589,11 @@ class OC_OCS {
if(OC_User::userExists($user)) {
// calculate the disc space
$user_dir = '/'.$user.'/files';
OC_Filesystem::init($user_dir);
\OC\Files\Filesystem::init($user_dir);
$rootInfo=OC_FileCache::get('');
$sharedInfo=OC_FileCache::get('/Shared');
$used=$rootInfo['size']-$sharedInfo['size'];
$free=OC_Filesystem::free_space();
$free=\OC\Files\Filesystem::free_space();
$total=$free+$used;
if($total==0) $total=1; // prevent division by zero
$relative=round(($used/$total)*10000)/100;

2
lib/public/files.php
View File

@ -98,7 +98,7 @@ class Files {
/**
* @param string appid
* @param $app app
* @return OC_FilesystemView
* @return \OC\Files\View
*/
public static function getStorage( $app ) {
return \OC_App::getStorage( $app );

6
lib/public/share.php
View File

@ -515,7 +515,7 @@ class Share {
$backend = self::getBackend($itemType);
// Get filesystem root to add it to the file target and remove from the file source, match file_source with the file cache
if ($itemType == 'file' || $itemType == 'folder') {
$root = \OC_Filesystem::getRoot();
$root = \OC\Files\Filesystem::getRoot();
$where = 'INNER JOIN `*PREFIX*fscache` ON `file_source` = `*PREFIX*fscache`.`id`';
if (!isset($item)) {
$where .= ' WHERE `file_target` IS NOT NULL';
@ -602,7 +602,7 @@ class Share {
} else {
if ($itemType == 'file' || $itemType == 'folder') {
$where .= ' `file_target` = ?';
$item = \OC_Filesystem::normalizePath($item);
$item = \OC\Files\Filesystem::normalizePath($item);
} else {
$where .= ' `item_target` = ?';
}
@ -751,7 +751,7 @@ class Share {
} else {
$childItem['file_source'] = \OC_FileCache::getId($child['file_path']);
}
$childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']);
$childItem['file_target'] = \OC\Files\Filesystem::normalizePath($child['file_path']);
}
if (isset($item)) {
if ($childItem[$column] == $item) {

10
lib/util.php
View File

@ -34,7 +34,7 @@ class OC_Util {
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
//first set up the local "root" storage
if(!self::$rootMounted) {
OC_Filesystem::mount('\OC\Files\Storage\Local',array('datadir'=>$CONFIG_DATADIRECTORY),'/');
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local',array('datadir'=>$CONFIG_DATADIRECTORY),'/');
self::$rootMounted=true;
}
@ -46,8 +46,8 @@ class OC_Util {
mkdir( $userdirectory, 0755, true );
}
//jail the user into his "home" directory
OC_Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => $user_root), $user);
OC_Filesystem::init($user_dir);
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => $user_root), $user);
\OC\Files\Filesystem::init($user_dir);
$quotaProxy=new OC_FileProxy_Quota();
OC_FileProxy::register($quotaProxy);
// Load personal mount config
@ -55,7 +55,7 @@ class OC_Util {
$mountConfig = include($user_root.'/mount.php');
if (isset($mountConfig['user'][$user])) {
foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);
\OC\Files\Filesystem::mount($options['class'], $options['options'], $mountPoint);
}
}
}
@ -64,7 +64,7 @@ class OC_Util {
}
public static function tearDownFS() {
OC_Filesystem::tearDown();
\OC\Files\Filesystem::tearDown();
self::$fsSetup=false;
}

2
settings/personal.php
View File

@ -25,7 +25,7 @@ if (!isset($sharedInfo['size'])) {
}
$used=$rootInfo['size']-$sharedSize;
if($used<0) $used=0;
$free=OC_Filesystem::free_space();
$free=\OC\Files\Filesystem::free_space();
$total=$free+$used;
if($total==0) $total=1; // prevent division by zero
$relative=round(($used/$total)*10000)/100;

4
tests/lib/cache/file.php vendored
View File

@ -38,8 +38,8 @@ class Test_Cache_File extends Test_Cache {
}
//set up temporary storage
OC_Filesystem::clearMounts();
OC_Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/');
\OC\Files\Filesystem::clearMounts();
\OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/');
OC_User::clearBackends();
OC_User::useBackend(new OC_User_Dummy());

56
tests/lib/filesystem.php
View File

@ -20,6 +20,8 @@
*
*/
use \OC\Files\Filesystem as Filesystem;
class Test_Filesystem extends UnitTestCase {
/**
* @var array tmpDirs
@ -42,64 +44,64 @@ class Test_Filesystem extends UnitTestCase {
}
public function setUp() {
OC_Filesystem::clearMounts();
Filesystem::clearMounts();
}
public function testMount() {
OC_Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/');
$this->assertEqual('/',OC_Filesystem::getMountPoint('/'));
$this->assertEqual('/',OC_Filesystem::getMountPoint('/some/folder'));
$this->assertEqual('',OC_Filesystem::getInternalPath('/'));
$this->assertEqual('some/folder',OC_Filesystem::getInternalPath('/some/folder'));
Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/');
$this->assertEqual('/',Filesystem::getMountPoint('/'));
$this->assertEqual('/',Filesystem::getMountPoint('/some/folder'));
$this->assertEqual('',Filesystem::getInternalPath('/'));
$this->assertEqual('some/folder',Filesystem::getInternalPath('/some/folder'));
OC_Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/some');
$this->assertEqual('/',OC_Filesystem::getMountPoint('/'));
$this->assertEqual('/some/',OC_Filesystem::getMountPoint('/some/folder'));
$this->assertEqual('/some/',OC_Filesystem::getMountPoint('/some/'));
$this->assertEqual('/',OC_Filesystem::getMountPoint('/some'));
$this->assertEqual('folder',OC_Filesystem::getInternalPath('/some/folder'));
Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/some');
$this->assertEqual('/',Filesystem::getMountPoint('/'));
$this->assertEqual('/some/',Filesystem::getMountPoint('/some/folder'));
$this->assertEqual('/some/',Filesystem::getMountPoint('/some/'));
$this->assertEqual('/',Filesystem::getMountPoint('/some'));
$this->assertEqual('folder',Filesystem::getInternalPath('/some/folder'));
}
public function testNormalize() {
$this->assertEqual('/path', OC_Filesystem::normalizePath('/path/'));
$this->assertEqual('/path/', OC_Filesystem::normalizePath('/path/', false));
$this->assertEqual('/path', OC_Filesystem::normalizePath('path'));
$this->assertEqual('/path', OC_Filesystem::normalizePath('\path'));
$this->assertEqual('/foo/bar', OC_Filesystem::normalizePath('/foo//bar/'));
$this->assertEqual('/foo/bar', OC_Filesystem::normalizePath('/foo////bar'));
$this->assertEqual('/path', Filesystem::normalizePath('/path/'));
$this->assertEqual('/path/', Filesystem::normalizePath('/path/', false));
$this->assertEqual('/path', Filesystem::normalizePath('path'));
$this->assertEqual('/path', Filesystem::normalizePath('\path'));
$this->assertEqual('/foo/bar', Filesystem::normalizePath('/foo//bar/'));
$this->assertEqual('/foo/bar', Filesystem::normalizePath('/foo////bar'));
if (class_exists('Normalizer')) {
$this->assertEqual("/foo/bar\xC3\xBC", OC_Filesystem::normalizePath("/foo/baru\xCC\x88"));
$this->assertEqual("/foo/bar\xC3\xBC", Filesystem::normalizePath("/foo/baru\xCC\x88"));
}
}
public function testHooks() {
if(OC_Filesystem::getView()){
if(Filesystem::getView()){
$user = OC_User::getUser();
}else{
$user=uniqid();
OC_Filesystem::init('/'.$user.'/files');
Filesystem::init('/'.$user.'/files');
}
OC_Hook::clear('OC_Filesystem');
OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
OC_Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');
Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');
$rootView=new \OC\Files\View('');
$rootView->mkdir('/'.$user);
$rootView->mkdir('/'.$user.'/files');
OC_Filesystem::file_put_contents('/foo', 'foo');
OC_Filesystem::mkdir('/bar');
OC_Filesystem::file_put_contents('/bar//foo', 'foo');
Filesystem::file_put_contents('/foo', 'foo');
Filesystem::mkdir('/bar');
Filesystem::file_put_contents('/bar//foo', 'foo');
$tmpFile = OC_Helper::tmpFile();
file_put_contents($tmpFile, 'foo');
$fh = fopen($tmpFile, 'r');
OC_Filesystem::file_put_contents('/bar//foo', $fh);
Filesystem::file_put_contents('/bar//foo', $fh);
}
public function dummyHook($arguments) {
$path = $arguments['path'];
$this->assertEqual($path, OC_Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized
$this->assertEqual($path, Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized
}
}