make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs
This commit is contained in:
parent
9aa9110fd9
commit
5708488b3e
|
@ -58,8 +58,9 @@ class Storage {
|
||||||
public function store($filename) {
|
public function store($filename) {
|
||||||
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
||||||
list($uid, $filename) = self::getUidAndFilename($filename);
|
list($uid, $filename) = self::getUidAndFilename($filename);
|
||||||
$files_view = new \OC_FilesystemView('/'.$uid.'/files');
|
$userHome = \OC_User::getHome($uid);
|
||||||
$users_view = new \OC_FilesystemView('/'.$uid);
|
$files_view = new \OC_FilesystemView($userHome.'/files');
|
||||||
|
$users_view = new \OC_FilesystemView($userHome);
|
||||||
|
|
||||||
//check if source file already exist as version to avoid recursions.
|
//check if source file already exist as version to avoid recursions.
|
||||||
// todo does this check work?
|
// todo does this check work?
|
||||||
|
@ -94,7 +95,7 @@ class Storage {
|
||||||
|
|
||||||
// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
|
// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
|
||||||
if ($uid == \OCP\User::getUser()) {
|
if ($uid == \OCP\User::getUser()) {
|
||||||
$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
|
$versions_fileview = new \OC_FilesystemView($userHome.'/files_versions');
|
||||||
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
|
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
|
||||||
$matches=glob($versionsFolderName.'/'.$filename.'.v*');
|
$matches=glob($versionsFolderName.'/'.$filename.'.v*');
|
||||||
sort($matches);
|
sort($matches);
|
||||||
|
@ -127,7 +128,7 @@ class Storage {
|
||||||
|
|
||||||
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
||||||
list($uid, $filename) = self::getUidAndFilename($filename);
|
list($uid, $filename) = self::getUidAndFilename($filename);
|
||||||
$users_view = new \OC_FilesystemView('/'.$uid);
|
$users_view = new \OC_FilesystemView(\OC_User::getHome($uid));
|
||||||
|
|
||||||
// rollback
|
// rollback
|
||||||
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
|
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
|
||||||
|
@ -150,7 +151,7 @@ class Storage {
|
||||||
public static function isversioned($filename) {
|
public static function isversioned($filename) {
|
||||||
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
|
||||||
list($uid, $filename) = self::getUidAndFilename($filename);
|
list($uid, $filename) = self::getUidAndFilename($filename);
|
||||||
$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
|
$versions_fileview = new \OC_FilesystemView(\OC_User::getHome($uid).'/files_versions');
|
||||||
|
|
||||||
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
|
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
|
||||||
|
|
||||||
|
@ -178,7 +179,7 @@ class Storage {
|
||||||
|
|
||||||
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
|
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
|
||||||
list($uid, $filename) = self::getUidAndFilename($filename);
|
list($uid, $filename) = self::getUidAndFilename($filename);
|
||||||
$versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
|
$versions_fileview = new \OC_FilesystemView(\OC_User::getHome($uid).'/files_versions');
|
||||||
|
|
||||||
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
|
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
|
||||||
$versions = array();
|
$versions = array();
|
||||||
|
@ -190,7 +191,7 @@ class Storage {
|
||||||
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
$files_view = new \OC_FilesystemView('/'.$uid.'/files');
|
$files_view = new \OC_FilesystemView(\OC_User::getHome($uid).'/files');
|
||||||
$local_file = $files_view->getLocalFile($filename);
|
$local_file = $files_view->getLocalFile($filename);
|
||||||
foreach( $matches as $ma ) {
|
foreach( $matches as $ma ) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue