Merge pull request #3991 from MrPetovan/bug/undefined-variables

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 9f455a19f345ff1fddfaf50be7f24f8c2930fded..931dcb720024473179ee191d892bb1980fa65917 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -1,6 +1,8 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once('include/attach.php');
 require_once('include/datetime.php');
@@ -14,7 +16,7 @@ function wall_attach_post(App $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();
@@ -57,7 +59,7 @@ function wall_attach_post(App $a) {
                                        intval($contact_id),
                                        intval($page_owner_uid)
                                );
-                               if (dbm::is_result($r)) {
+                               if (DBM::is_result($r)) {
                                        $can_post = true;
                                        $visitor = $contact_id;
                                }
@@ -84,7 +86,7 @@ function wall_attach_post(App $a) {
        $filename = basename($_FILES['userfile']['name']);
        $filesize = intval($_FILES['userfile']['size']);
 
-       $maxfilesize = get_config('system','maxfilesize');
+       $maxfilesize = Config::get('system','maxfilesize');
 
        /* Found html code written in text field of form,
         * when trying to upload a file with filesize
@@ -114,26 +116,6 @@ function wall_attach_post(App $a) {
                killme();
        }
 
-       $limit = service_class_fetch($page_owner_uid,'attach_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' ",
-                       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();
-               }
-       }
-
        $filedata = @file_get_contents($src);
        $mimetype = z_mime_content_type($filename);
        $hash = get_guid(64);
@@ -163,7 +145,7 @@ function wall_attach_post(App $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));