harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make storage limit service classes apply to accounts, not channels. Also include a css file that was missing from work yesterday.

Browse Source
This commit is contained in:
friendica 2014-01-07 14:10:28 -08:00
parent e635dcb309
commit b8564134aa
7 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/attach.php
View File

@ -330,8 +330,8 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) {
$limit = service_class_fetch($channel_id,'attach_upload_limit');
if($limit !== false) {
$r = q("select sum(filesize) as total from attach where uid = %d ",
intval($channel_id)
$r = q("select sum(filesize) as total from attach where aid = %d ",
intval($channel['channel_account_id'])
);
if(($r) && (($r[0]['total'] + $filesize) > ($limit - $existing_size))) {
$ret['message'] = upgrade_message(true).sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."),$limit / 1024000);

6
include/photos.php
View File

@ -102,12 +102,10 @@ function photo_upload($channel, $observer, $args) {
$imagedata = @file_get_contents($src);
$r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
intval($channel_id)
$r = q("select sum(size) as total from photo where aid = %d and scale = 0 ",
intval($account_id)
);
// FIXME service class limits should probably apply to accounts and not channels
$limit = service_class_fetch($channel_id,'photo_upload_limit');
if(($r) && ($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {

8
include/reddav.php
View File

@ -160,8 +160,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
$limit = service_class_fetch($c[0]['channel_id'],'attach_upload_limit');
if($limit !== false) {
$x = q("select sum(filesize) as total from attach where uid = %d ",
intval($c[0]['channel_id'])
$x = q("select sum(filesize) as total from attach where aid = %d ",
intval($c[0]['channel_account_id'])
);
if(($x) && ($x[0]['total'] + $r[0]['filesize'] > $limit)) {
q("delete from attach where hash = '%s' and uid = %d limit 1",
@ -359,8 +359,8 @@ class RedFile extends DAV\Node implements DAV\IFile {
$limit = service_class_fetch($c[0]['channel_id'],'attach_upload_limit');
if($limit !== false) {
$x = q("select sum(filesize) as total from attach where uid = %d ",
intval($c[0]['channel_id'])
$x = q("select sum(filesize) as total from attach where aid = %d ",
intval($c[0]['channel_account_id'])
);
if(($x) && ($x[0]['total'] + $r[0]['filesize'] > $limit)) {
q("delete from attach where hash = '%s' and uid = %d limit 1",

7
mod/filestorage.php
View File

@ -42,10 +42,11 @@ function filestorage_content(&$a) {
return;
}
$r = q("select channel_id from channel where channel_address = '%s'",
$r = q("select * from channel where channel_address = '%s'",
dbesc($which)
);
if($r) {
$channel = $r[0];
$owner = intval($r[0]['channel_id']);
}
@ -146,8 +147,8 @@ function filestorage_content(&$a) {
}
$limit = service_class_fetch ($owner,'attach_upload_limit');
$r = q("select sum(filesize) as total from attach where uid = %d ",
intval($owner)
$r = q("select sum(filesize) as total from attach where aid = %d ",
intval($channel['channel_account_id'])
);
$used = $r[0]['total'];

4
mod/photos.php
View File

@ -687,8 +687,8 @@ function photos_content(&$a) {
/* Show space usage */
$r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
intval($a->data['channel']['channel_id'])
$r = q("select sum(size) as total from photo where aid = %d and scale = 0 ",
intval($a->data['channel']['channel_account_id'])
);

3
version.inc
View File

@ -1,2 +1 @@
2014-01-06.549
2014-01-07.550

11
view/css/mod_filestorage.css Normal file
View File

@ -0,0 +1,11 @@
#attach-edit-backlink, #cut-paste-link {
margin-bottom: 10px;
}
#attach-edit-submit {
margin-top: 20px;
}
#cutpasteinput {
width: 600px;
}