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 932b6241d88b2df15fffef57de0e1e0e0b74059f..931dcb720024473179ee191d892bb1980fa65917 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -1,5 +1,9 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+
 require_once('include/attach.php');
 require_once('include/datetime.php');
 
@@ -7,12 +11,12 @@ function wall_attach_post(App $a) {
 
        $r_json = (x($_GET,'response') && $_GET['response']=='json');
 
-       if ($a->argc > 1) {
+       if($a->argc > 1) {
                $nick = $a->argv[1];
                $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();
@@ -36,33 +40,33 @@ function wall_attach_post(App $a) {
        $page_owner_nick  = $r[0]['nickname'];
        $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
-       if ((local_user()) && (local_user() == $page_owner_uid))
+       if((local_user()) && (local_user() == $page_owner_uid))
                $can_post = true;
        else {
-               if ($community_page && remote_user()) {
+               if($community_page && remote_user()) {
                        $contact_id = 0;
-                       if (is_array($_SESSION['remote'])) {
-                               foreach ($_SESSION['remote'] as $v) {
-                                       if ($v['uid'] == $page_owner_uid) {
+                       if(is_array($_SESSION['remote'])) {
+                               foreach($_SESSION['remote'] as $v) {
+                                       if($v['uid'] == $page_owner_uid) {
                                                $contact_id = $v['cid'];
                                                break;
                                        }
                                }
                        }
-                       if ($contact_id) {
+                       if($contact_id) {
 
                                $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
                                        intval($contact_id),
                                        intval($page_owner_uid)
                                );
-                               if (dbm::is_result($r)) {
+                               if (DBM::is_result($r)) {
                                        $can_post = true;
                                        $visitor = $contact_id;
                                }
                        }
                }
        }
-       if (! $can_post) {
+       if(! $can_post) {
                if ($r_json) {
                        echo json_encode(array('error'=>t('Permission denied.')));
                        killme();
@@ -71,7 +75,7 @@ function wall_attach_post(App $a) {
                killme();
        }
 
-       if (! x($_FILES,'userfile')) {
+       if(! x($_FILES,'userfile')) {
                if ($r_json) {
                        echo json_encode(array('error'=>t('Invalid request.')));
                }
@@ -82,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
@@ -90,7 +94,7 @@ function wall_attach_post(App $a) {
         * Then Filesize gets <= 0.
         */
 
-       if ($filesize <=0) {
+       if($filesize <=0) {
                $msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?'));
                if ($r_json) {
                        echo json_encode(array('error'=>$msg));
@@ -101,7 +105,7 @@ function wall_attach_post(App $a) {
                killme();
        }
 
-       if (($maxfilesize) && ($filesize > $maxfilesize)) {
+       if(($maxfilesize) && ($filesize > $maxfilesize)) {
                $msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize));
                if ($r_json) {
                        echo json_encode(array('error'=>$msg));
@@ -112,49 +116,20 @@ 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);
        $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);
 
-       if (! $r) {
+       if(! $r) {
                $msg =  t('File upload failed.');
                if ($r_json) {
                        echo json_encode(array('error'=>$msg));
@@ -170,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));