Merge pull request #3289 from Hypolite/improvement/add-composer

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 80fc1c6e796e71c11940e7e3f3f10f40e529f7f6..0fc8b8a6a3aae79a60dc1bf70459de1bde6bed01 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -3,7 +3,7 @@
 require_once('include/attach.php');
 require_once('include/datetime.php');
 
-function wall_attach_post(&$a) {
+function wall_attach_post(App $a) {
 
        $r_json = (x($_GET,'response') && $_GET['response']=='json');
 
@@ -12,7 +12,7 @@ function wall_attach_post(&$a) {
                $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
                        dbesc($nick)
                );
-               if(! dbm::is_result($r)){
+               if (! dbm::is_result($r)) {
                        if ($r_json) {
                                echo json_encode(array('error'=>t('Invalid request.')));
                                killme();
@@ -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);
@@ -168,7 +170,7 @@ function wall_attach_post(&$a) {
                dbesc($hash)
        );
 
-       if(! dbm::is_result($r)) {
+       if (! dbm::is_result($r)) {
                $msg = t('File upload failed.');
                if ($r_json) {
                        echo json_encode(array('error'=>$msg));