Merge pull request #4170 from MrPetovan/bug/4155-remove-proxy-oembed

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 80fc1c6e796e71c11940e7e3f3f10f40e529f7f6..931dcb720024473179ee191d892bb1980fa65917 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -1,9 +1,13 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+
 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 +16,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();
@@ -55,7 +59,7 @@ function wall_attach_post(&$a) {
                                        intval($contact_id),
                                        intval($page_owner_uid)
                                );
-                               if (dbm::is_result($r)) {
+                               if (DBM::is_result($r)) {
                                        $can_post = true;
                                        $visitor = $contact_id;
                                }
@@ -82,7 +86,7 @@ function wall_attach_post(&$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
@@ -112,43 +116,16 @@ 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 ;
-               }
-               @unlink($src);
-               killme();
-       }
-
-
        $filedata = @file_get_contents($src);
        $mimetype = z_mime_content_type($filename);
        $hash = get_guid(64);
        $created = datetime_convert();
-       $r = q("INSERT INTO `attach` ( `uid`, `hash`, `filename`, `filetype`, `filesize`, `data`, `created`, `edited`, `allow_cid`, `allow_gid`,`deny_cid`, `deny_gid` )
-               VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
-               intval($page_owner_uid),
-               dbesc($hash),
-               dbesc($filename),
-               dbesc($mimetype),
-               intval($filesize),
-               dbesc($filedata),
-               dbesc($created),
-               dbesc($created),
-               dbesc('<' . $page_owner_cid . '>'),
-               dbesc(''),
-               dbesc(''),
-               dbesc('')
-       );
+
+       $fields = array('uid' => $page_owner_uid, 'hash' => $hash, 'filename' => $filename, 'filetype' => $mimetype,
+               'filesize' => $filesize, 'data' => $filedata, 'created' => $created, 'edited' => $created,
+               'allow_cid' => '<' . $page_owner_cid . '>', 'allow_gid' => '','deny_cid' => '', 'deny_gid' => '');
+
+       $r = dba::insert('attach', $fields);
 
        @unlink($src);
 
@@ -168,7 +145,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));