Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
c5ba4f47
Commit
c5ba4f47
authored
12 years ago
by
Jörn Friedrich Dreyer
Browse files
Options
Downloads
Patches
Plain Diff
fix quota off by one error
parent
c0538636
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/fileproxy/quota.php
+8
-8
8 additions, 8 deletions
lib/fileproxy/quota.php
with
8 additions
and
8 deletions
lib/fileproxy/quota.php
+
8
−
8
View file @
c5ba4f47
...
@@ -43,7 +43,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
...
@@ -43,7 +43,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
$userQuota
=
OC_AppConfig
::
getValue
(
'files'
,
'default_quota'
,
'none'
);
$userQuota
=
OC_AppConfig
::
getValue
(
'files'
,
'default_quota'
,
'none'
);
}
}
if
(
$userQuota
==
'none'
)
{
if
(
$userQuota
==
'none'
)
{
$this
->
userQuota
[
$user
]
=
0
;
$this
->
userQuota
[
$user
]
=
-
1
;
}
else
{
}
else
{
$this
->
userQuota
[
$user
]
=
OC_Helper
::
computerFileSize
(
$userQuota
);
$this
->
userQuota
[
$user
]
=
OC_Helper
::
computerFileSize
(
$userQuota
);
}
}
...
@@ -61,8 +61,8 @@ class OC_FileProxy_Quota extends OC_FileProxy{
...
@@ -61,8 +61,8 @@ class OC_FileProxy_Quota extends OC_FileProxy{
$owner
=
$storage
->
getOwner
(
$path
);
$owner
=
$storage
->
getOwner
(
$path
);
$totalSpace
=
$this
->
getQuota
(
$owner
);
$totalSpace
=
$this
->
getQuota
(
$owner
);
if
(
$totalSpace
==
0
)
{
if
(
$totalSpace
==
-
1
)
{
return
0
;
return
-
1
;
}
}
$rootInfo
=
OC_FileCache
::
get
(
''
,
"/"
.
$owner
.
"/files"
);
$rootInfo
=
OC_FileCache
::
get
(
''
,
"/"
.
$owner
.
"/files"
);
...
@@ -79,7 +79,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
...
@@ -79,7 +79,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
public
function
postFree_space
(
$path
,
$space
)
{
public
function
postFree_space
(
$path
,
$space
)
{
$free
=
$this
->
getFreeSpace
(
$path
);
$free
=
$this
->
getFreeSpace
(
$path
);
if
(
$free
==
0
)
{
if
(
$free
==
-
1
)
{
return
$space
;
return
$space
;
}
}
return
min
(
$free
,
$space
);
return
min
(
$free
,
$space
);
...
@@ -89,21 +89,21 @@ class OC_FileProxy_Quota extends OC_FileProxy{
...
@@ -89,21 +89,21 @@ class OC_FileProxy_Quota extends OC_FileProxy{
if
(
is_resource
(
$data
))
{
if
(
is_resource
(
$data
))
{
$data
=
''
;
//TODO: find a way to get the length of the stream without emptying it
$data
=
''
;
//TODO: find a way to get the length of the stream without emptying it
}
}
return
(
strlen
(
$data
)
<
$this
->
getFreeSpace
(
$path
)
or
$this
->
getFreeSpace
(
$path
)
==
0
);
return
(
strlen
(
$data
)
<
$this
->
getFreeSpace
(
$path
)
or
$this
->
getFreeSpace
(
$path
)
==
-
1
);
}
}
public
function
preCopy
(
$path1
,
$path2
)
{
public
function
preCopy
(
$path1
,
$path2
)
{
if
(
!
self
::
$rootView
)
{
if
(
!
self
::
$rootView
)
{
self
::
$rootView
=
new
OC_FilesystemView
(
''
);
self
::
$rootView
=
new
OC_FilesystemView
(
''
);
}
}
return
(
self
::
$rootView
->
filesize
(
$path1
)
<
$this
->
getFreeSpace
(
$path2
)
or
$this
->
getFreeSpace
(
$path2
)
==
0
);
return
(
self
::
$rootView
->
filesize
(
$path1
)
<
$this
->
getFreeSpace
(
$path2
)
or
$this
->
getFreeSpace
(
$path2
)
==
-
1
);
}
}
public
function
preFromTmpFile
(
$tmpfile
,
$path
)
{
public
function
preFromTmpFile
(
$tmpfile
,
$path
)
{
return
(
filesize
(
$tmpfile
)
<
$this
->
getFreeSpace
(
$path
)
or
$this
->
getFreeSpace
(
$path
)
==
0
);
return
(
filesize
(
$tmpfile
)
<
$this
->
getFreeSpace
(
$path
)
or
$this
->
getFreeSpace
(
$path
)
==
-
1
);
}
}
public
function
preFromUploadedFile
(
$tmpfile
,
$path
)
{
public
function
preFromUploadedFile
(
$tmpfile
,
$path
)
{
return
(
filesize
(
$tmpfile
)
<
$this
->
getFreeSpace
(
$path
)
or
$this
->
getFreeSpace
(
$path
)
==
0
);
return
(
filesize
(
$tmpfile
)
<
$this
->
getFreeSpace
(
$path
)
or
$this
->
getFreeSpace
(
$path
)
==
-
1
);
}
}
}
}
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