Friendicaland

[friendica.git] / mod / wall_attach.php

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index a66ed0d059c6d36970d0f77ff2796541e68a301a..c23efc7869a7181985afdd73c385dd5d43a74c2a 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -7,7 +7,7 @@ function wall_attach_post(&$a) {
 
        if($a->argc > 1) {
                $nick = $a->argv[1];
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 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(! count($r))
@@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
        $visitor   = 0;
 
        $page_owner_uid   = $r[0]['uid'];
+       $page_owner_cid   = $r[0]['id'];
        $page_owner_nick  = $r[0]['nickname'];
        $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
@@ -28,17 +29,28 @@ function wall_attach_post(&$a) {
                $can_post = true;
        else {
                if($community_page && remote_user()) {
-                       $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
-                               intval(remote_user()),
-                               intval($page_owner_uid)
-                       );
-                       if(count($r)) {
-                               $can_post = true;
-                               $visitor = remote_user();
+                       $cid = 0;
+                       if(is_array($_SESSION['remote'])) {
+                               foreach($_SESSION['remote'] as $v) {
+                                       if($v['uid'] == $page_owner_uid) {
+                                               $cid = $v['cid'];
+                                               break;
+                                       }
+                               }
+                       }
+                       if($cid) {
+
+                               $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+                                       intval($cid),
+                                       intval($page_owner_uid)
+                               );
+                               if(count($r)) {
+                                       $can_post = true;
+                                       $visitor = $cid;
+                               }
                        }
                }
        }
-
        if(! $can_post) {
                notice( t('Permission denied.') . EOL );
                killme();
@@ -59,10 +71,21 @@ function wall_attach_post(&$a) {
                return;
        }
 
+       $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)) {
+               echo upgrade_message(true) . EOL ;
+               @unlink($src);
+               killme();
+       }
+
+
        $filedata = @file_get_contents($src);
        $mimetype = z_mime_content_type($filename);
-       if(((! strlen($mimetype)) || ($mimetype === 'application/octet-stream')) && function_exists('mime_content_type'))
-               $mimetype = mime_content_type($filename);
        $hash = random_string();
        $created = datetime_convert();
        $r = q("INSERT INTO `attach` ( `uid`, `hash`, `filename`, `filetype`, `filesize`, `data`, `created`, `edited`, `allow_cid`, `allow_gid`,`deny_cid`, `deny_gid` )
@@ -75,7 +98,7 @@ function wall_attach_post(&$a) {
                dbesc($filedata),
                dbesc($created),
                dbesc($created),
-               dbesc('<' . $page_owner_uid . '>'),
+               dbesc('<' . $page_owner_cid . '>'),
                dbesc(''),
                dbesc(''),
                dbesc('')
@@ -99,8 +122,13 @@ function wall_attach_post(&$a) {
                killme();
        }
 
-       echo  '<br /><br />[attachment]' . $r[0]['id'] . '[/attachment]' . '<br />';
+       $lf = '<br />';
+
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $lf = "\n";
 
+       echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
+       
        killme();
        // NOTREACHED
 }