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

fix broken paths in versions app

This commit is contained in:
Björn Schießle 2012-10-27 15:24:01 +02:00 committed by Robin Appelman
parent 7891add286
commit 72aebe3aa3
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,10 +58,8 @@ 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\Files\View('/'.\OCP\User::getUser() .'/files');
$userHome = \OC_User::getHome($uid); $users_view = new \OC\Files\View('/'.\OCP\User::getUser());
$files_view = new \OC\Files\View($userHome.'/files');
$users_view = new \OC\Files\View($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?
@ -96,11 +94,12 @@ 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\Files\View($userHome.'/files_versions'); $versions_fileview = new \OC\Files\View('/'.\OCP\User::getUser().'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
$matches=glob($versionsFolderName.'/'.$filename.'.v*'); $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
$matches=glob($versionsName.'.v*');
sort($matches); sort($matches);
$parts=explode('.v', end($matches)); $parts=explode('.v',end($matches));
if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) { if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) {
return false; return false;
} }
@ -110,7 +109,7 @@ class Storage {
// create all parent folders // create all parent folders
$info=pathinfo($filename); $info=pathinfo($filename);
if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
mkdir($versionsFolderName.'/'.$info['dirname'],0750, true); mkdir($versionsFolderName.'/'.$info['dirname'],0750,true);
} }
// store a new version of a file // store a new version of a file
@ -129,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\Files\View(\OC_User::getHome($uid)); $users_view = new \OC\Files\View('/'.\OCP\User::getUser());
// rollback // rollback
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) { if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
@ -152,12 +151,12 @@ 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\Files\View(\OC_User::getHome($uid).'/files_versions'); $versions_fileview = new \OC\Files\View('/'.\OCP\User::getUser().'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
// check for old versions // check for old versions
$matches=glob($versionsFolderName.$filename.'.v*'); $matches=glob($versionsName.'.v*');
if(count($matches)>0) { if(count($matches)>0) {
return true; return true;
}else{ }else{
@ -177,22 +176,20 @@ class Storage {
* @returns array * @returns array
*/ */
public static function getVersions( $filename, $count = 0 ) { public static function getVersions( $filename, $count = 0 ) {
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\Files\View(\OC_User::getHome($uid).'/files_versions'); $versions_fileview = new \OC\Files\View('/'.\OCP\User::getUser().'/files_versions');
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); $versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
$versions = array(); $versions = array();
// fetch for old versions // fetch for old versions
$matches = glob( $versionsFolderName.'/'.$filename.'.v*' ); $matches = glob( $versionsName.'.v*' );
sort( $matches ); sort( $matches );
$i = 0; $i = 0;
$files_view = new \OC\Files\View(\OC_User::getHome($uid).'/files'); $files_view = new \OC\Files\View('/'.\OCP\User::getUser().'/files');
$local_file = $files_view->getLocalFile($filename); $local_file = $files_view->getLocalFile($filename);
foreach( $matches as $ma ) { foreach( $matches as $ma ) {
@ -249,10 +246,10 @@ class Storage {
list($uid, $filename) = self::getUidAndFilename($filename); list($uid, $filename) = self::getUidAndFilename($filename);
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); $versionsName=\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
// check for old versions // check for old versions
$matches = glob( $versionsFolderName.'/'.$filename.'.v*' ); $matches = glob( $versionsName.'.v*' );
if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) { if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
@ -263,7 +260,7 @@ class Storage {
foreach( $deleteItems as $de ) { foreach( $deleteItems as $de ) {
unlink( $versionsFolderName.'/'.$filename.'.v'.$de ); unlink( $versionsName.'.v'.$de );
} }
} }