Skip to content
Snippets Groups Projects
Commit b16c5a6d authored by Björn Schießle's avatar Björn Schießle
Browse files

fix array access and change variable names according to the coding style

parent 15f7bb29
No related branches found
No related tags found
No related merge requests found
...@@ -398,7 +398,7 @@ class Storage { ...@@ -398,7 +398,7 @@ class Storage {
private static function expire($filename, $versionsSize = null, $offset = 0) { private static function expire($filename, $versionsSize = null, $offset = 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('/'.$uid.'/files_versions'); $versionsFileview = new \OC\Files\View('/'.$uid.'/files_versions');
// get available disk space for user // get available disk space for user
$softQuota = true; $softQuota = true;
...@@ -445,20 +445,20 @@ class Storage { ...@@ -445,20 +445,20 @@ class Storage {
$allFiles = false; $allFiles = false;
} }
$all_versions = Storage::getVersions($uid, $filename); $allVersions = Storage::getVersions($uid, $filename);
$versions_by_file[$filename] = $all_versions; $versionsByFile[$filename] = $allVersions;
$sizeOfDeletedVersions = self::delOldVersions($versions_by_file, $all_versions, $versions_fileview); $sizeOfDeletedVersions = self::delOldVersions($versionsByFile, $allVersions, $versionsFileview);
$availableSpace = $availableSpace + $sizeOfDeletedVersions; $availableSpace = $availableSpace + $sizeOfDeletedVersions;
$versionsSize = $versionsSize - $sizeOfDeletedVersions; $versionsSize = $versionsSize - $sizeOfDeletedVersions;
// if still not enough free space we rearrange the versions from all files // if still not enough free space we rearrange the versions from all files
if ($availableSpace <= 0 || $allFiles) { if ($availableSpace <= 0 || $allFiles) {
$result = Storage::getAllVersions($uid); $result = Storage::getAllVersions($uid);
$versions_by_file = $result['by_file']; $versionsByFile = $result['by_file'];
$all_versions = $result['all']; $allVersions = $result['all'];
$sizeOfDeletedVersions = self::delOldVersions($versions_by_file, $all_versions, $versions_fileview); $sizeOfDeletedVersions = self::delOldVersions($versionsByFile, $allVersions, $versionsFileview);
$availableSpace = $availableSpace + $sizeOfDeletedVersions; $availableSpace = $availableSpace + $sizeOfDeletedVersions;
$versionsSize = $versionsSize - $sizeOfDeletedVersions; $versionsSize = $versionsSize - $sizeOfDeletedVersions;
} }
...@@ -466,12 +466,14 @@ class Storage { ...@@ -466,12 +466,14 @@ class Storage {
// Check if enough space is available after versions are rearranged. // Check if enough space is available after versions are rearranged.
// If not we delete the oldest versions until we meet the size limit for versions, // If not we delete the oldest versions until we meet the size limit for versions,
// but always keep the two latest versions // but always keep the two latest versions
$numOfVersions = count($all_versions) -2 ; $numOfVersions = count($allVersions) -2 ;
$i = 0; $i = 0;
while ($availableSpace < 0 && $i < $numOfVersions) { while ($availableSpace < 0 && $i < $numOfVersions) {
$versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']); $version = current($allVersions);
$versionsSize -= $all_versions[$i]['size']; $versionsFileview->unlink($version['path'].'.v'.$version['version']);
$availableSpace += $all_versions[$i]['size']; $versionsSize -= $version['size'];
$availableSpace += $version['size'];
next($allVersions);
$i++; $i++;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment