Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
b16c5a6d
Commit
b16c5a6d
authored
11 years ago
by
Björn Schießle
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
apps/files_versions/lib/versions.php
+13
-11
13 additions, 11 deletions
apps/files_versions/lib/versions.php
with
13 additions
and
11 deletions
apps/files_versions/lib/versions.php
+
13
−
11
View file @
b16c5a6d
...
@@ -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
_f
ileview
=
new
\OC\Files\View
(
'/'
.
$uid
.
'/files_versions'
);
$versions
F
ileview
=
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
_v
ersions
=
Storage
::
getVersions
(
$uid
,
$filename
);
$all
V
ersions
=
Storage
::
getVersions
(
$uid
,
$filename
);
$versions
_by_f
ile
[
$filename
]
=
$all
_v
ersions
;
$versions
ByF
ile
[
$filename
]
=
$all
V
ersions
;
$sizeOfDeletedVersions
=
self
::
delOldVersions
(
$versions
_by_f
ile
,
$all
_v
ersions
,
$versions
_f
ileview
);
$sizeOfDeletedVersions
=
self
::
delOldVersions
(
$versions
ByF
ile
,
$all
V
ersions
,
$versions
F
ileview
);
$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_f
ile
=
$result
[
'by_file'
];
$versions
ByF
ile
=
$result
[
'by_file'
];
$all
_v
ersions
=
$result
[
'all'
];
$all
V
ersions
=
$result
[
'all'
];
$sizeOfDeletedVersions
=
self
::
delOldVersions
(
$versions
_by_f
ile
,
$all
_v
ersions
,
$versions
_f
ileview
);
$sizeOfDeletedVersions
=
self
::
delOldVersions
(
$versions
ByF
ile
,
$all
V
ersions
,
$versions
F
ileview
);
$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
_v
ersions
)
-
2
;
$numOfVersions
=
count
(
$all
V
ersions
)
-
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
++
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment