Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 68752a0e1f659082e51ec6df90add56663d5ba1d..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,21 +12,21 @@ 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(! count($r)){
+               if (! dbm::is_result($r)) {
                        if ($r_json) {
-                            echo json_encode(array('error'=>t('Invalid request.')));
-                            killme();
-                        }
+                               echo json_encode(array('error'=>t('Invalid request.')));
+                               killme();
+                       }
                        return;
-        }
+       }
 
        } else {
                if ($r_json) {
-                    echo json_encode(array('error'=>t('Invalid request.')));
-                    killme();
-                }
+                       echo json_encode(array('error'=>t('Invalid request.')));
+                       killme();
+               }
                return;
-    }
+       }
 
        $can_post  = false;
        $visitor   = 0;
@@ -40,41 +40,41 @@ function wall_attach_post(&$a) {
                $can_post = true;
        else {
                if($community_page && remote_user()) {
-                       $cid = 0;
+                       $contact_id = 0;
                        if(is_array($_SESSION['remote'])) {
                                foreach($_SESSION['remote'] as $v) {
                                        if($v['uid'] == $page_owner_uid) {
-                                               $cid = $v['cid'];
+                                               $contact_id = $v['cid'];
                                                break;
                                        }
                                }
                        }
-                       if($cid) {
+                       if($contact_id) {
 
                                $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
-                                       intval($cid),
+                                       intval($contact_id),
                                        intval($page_owner_uid)
                                );
-                               if(count($r)) {
+                               if (dbm::is_result($r)) {
                                        $can_post = true;
-                                       $visitor = $cid;
+                                       $visitor = $contact_id;
                                }
                        }
                }
        }
        if(! $can_post) {
                if ($r_json) {
-                    echo json_encode(array('error'=>t('Permission denied.')));
-                    killme();
-                }
+                       echo json_encode(array('error'=>t('Permission denied.')));
+                       killme();
+               }
                notice( t('Permission denied.') . EOL );
                killme();
        }
 
        if(! x($_FILES,'userfile')) {
                if ($r_json) {
-                    echo json_encode(array('error'=>t('Invalid request.')));
-                }
+                       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(! count($r)) {
+       if (! dbm::is_result($r)) {
                $msg = t('File upload failed.');
                if ($r_json) {
                        echo json_encode(array('error'=>$msg));
@@ -179,9 +181,9 @@ function wall_attach_post(&$a) {
        }
 
        if ($r_json) {
-            echo json_encode(array('ok'=>true));
-            killme();
-        }
+               echo json_encode(array('ok'=>true));
+               killme();
+       }
 
        $lf = "\n";