Don't do queries if not needed

diff --git a/mod/photos.php b/mod/photos.php
index e026944423491748732f7a02a25e4c8c376513bf..4b6704a719e2e8a0bd5a711459efcc86fc265013 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -818,22 +818,23 @@ function photos_post(&$a) {
        $imagedata = @file_get_contents($src);
 
 
-
-       $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'])
-       );
-
        $limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
 
-       if (($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-               notice( upgrade_message() . EOL );
-               @unlink($src);
-               $foo = 0;
-               call_hooks('photo_post_end',$foo);
-               killme();
+       if ($limit) {
+               $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'])
+               );
+               $size = $r[0]['total'];
+
+               if (($size + strlen($imagedata)) > $limit) {
+                       notice( upgrade_message() . EOL );
+                       @unlink($src);
+                       $foo = 0;
+                       call_hooks('photo_post_end',$foo);
+                       killme();
+               }
        }
 
-
        $ph = new Photo($imagedata, $type);
 
        if (! $ph->is_valid()) {

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 525d3509c17516f33efb52276eefba803db15d0b..fc82389741ecdd74ec0ca206891fdd606961859a 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -112,24 +112,26 @@ function wall_attach_post(&$a) {
                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');
 
-       if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-               $msg = upgrade_message(true);
-               if ($r_json) {
-                       echo json_encode(array('error'=>$msg));
-               } else {
-                       echo  $msg. EOL ;
+        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);
+                       if ($r_json) {
+                               echo json_encode(array('error'=>$msg));
+                       } else {
+                               echo  $msg. EOL ;
+                       }
+                       @unlink($src);
+                       killme();
                }
-               @unlink($src);
-               killme();
        }
 
-
        $filedata = @file_get_contents($src);
        $mimetype = z_mime_content_type($filename);
        $hash = get_guid(64);

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index eb2a92323ab0115b489e92bb371039d02b17e0f6..c789262c648b4175e018078f4d4798e41b091f50 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -166,21 +166,19 @@ function wall_upload_post(&$a, $desktopmode = true) {
                        intval($page_owner_uid)
                );
                $size = $r[0]['total'];
-       } else
-               $size = 0;
 
-       if(($limit !== false) && (($size + strlen($imagedata)) > $limit)) {
-               $msg = upgrade_message(true);
-               if ($r_json) {
-                       echo json_encode(array('error'=>$msg));
-               } else {
-                       echo  $msg. EOL;
+               if (($size + strlen($imagedata)) > $limit) {
+                       $msg = upgrade_message(true);
+                       if ($r_json) {
+                               echo json_encode(array('error'=>$msg));
+                       } else {
+                               echo  $msg. EOL;
+                       }
+                       @unlink($src);
+                       killme();
                }
-               @unlink($src);
-               killme();
        }
 
-
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);