mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Don't do queries if not needed

Browse source
This commit is contained in:
Michael 2017-01-07 11:28:18 +00:00
parent 414c5ddae0
commit 1b48799f08
3 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mod/photos.php
View file

@ -818,21 +818,22 @@ function photos_post(&$a) {
$imagedata = @file_get_contents($src); $imagedata = @file_get_contents($src);
$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
if ($limit) {
$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ", $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
intval($a->data['user']['uid']) intval($a->data['user']['uid'])
); );
$size = $r[0]['total'];
$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit'); if (($size + strlen($imagedata)) > $limit) {
if (($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
notice( upgrade_message() . EOL ); notice( upgrade_message() . EOL );
@unlink($src); @unlink($src);
$foo = 0; $foo = 0;
call_hooks('photo_post_end',$foo); call_hooks('photo_post_end',$foo);
killme(); killme();
} }
}
$ph = new Photo($imagedata, $type); $ph = new Photo($imagedata, $type);

14
mod/wall_attach.php
View file

@ -112,13 +112,15 @@ function wall_attach_post(&$a) {
killme(); killme();
} }
$r = q("select sum(octet_length(data)) as total from attach where uid = %d ",
intval($page_owner_uid)
);
$limit = service_class_fetch($page_owner_uid,'attach_upload_limit'); $limit = service_class_fetch($page_owner_uid,'attach_upload_limit');
if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { if ($limit) {
$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
intval($page_owner_uid)
);
$size = $r[0]['total'];
if (($size + strlen($imagedata)) > $limit) {
$msg = upgrade_message(true); $msg = upgrade_message(true);
if ($r_json) { if ($r_json) {
echo json_encode(array('error'=>$msg)); echo json_encode(array('error'=>$msg));
@ -128,7 +130,7 @@ function wall_attach_post(&$a) {
@unlink($src); @unlink($src);
killme(); killme();
} }
}
$filedata = @file_get_contents($src); $filedata = @file_get_contents($src);
$mimetype = z_mime_content_type($filename); $mimetype = z_mime_content_type($filename);

6
mod/wall_upload.php
View file

@ -166,10 +166,8 @@ function wall_upload_post(&$a, $desktopmode = true) {
intval($page_owner_uid) intval($page_owner_uid)
); );
$size = $r[0]['total']; $size = $r[0]['total'];
} else
$size = 0;
if(($limit !== false) && (($size + strlen($imagedata)) > $limit)) { if (($size + strlen($imagedata)) > $limit) {
$msg = upgrade_message(true); $msg = upgrade_message(true);
if ($r_json) { if ($r_json) {
echo json_encode(array('error'=>$msg)); echo json_encode(array('error'=>$msg));
@ -179,7 +177,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
@unlink($src); @unlink($src);
killme(); killme();
} }
}
$imagedata = @file_get_contents($src); $imagedata = @file_get_contents($src);
$ph = new Photo($imagedata, $filetype); $ph = new Photo($imagedata, $filetype);