tinymce: add filebrowser for photos and attached files

[friendica.git] / mod / wall_upload.php

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index f7638b7307d83f67af2186f6d8064d23006bae06..f341cc9cdaa837186d2b10d4efad4964f10f6fe5 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -6,7 +6,7 @@ function wall_upload_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))
@@ -16,10 +16,13 @@ function wall_upload_post(&$a) {
        else
                return;
 
+
+
        $can_post  = false;
        $visitor   = 0;
 
        $page_owner_uid   = $r[0]['uid'];
+       $default_cid      = $r[0]['id'];
        $page_owner_nick  = $r[0]['nickname'];
        $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
@@ -34,6 +37,7 @@ function wall_upload_post(&$a) {
                        if(count($r)) {
                                $can_post = true;
                                $visitor = remote_user();
+                               $default_cid = $visitor;
                        }
                }
        }
@@ -53,9 +57,9 @@ function wall_upload_post(&$a) {
        $maximagesize = get_config('system','maximagesize');
 
        if(($maximagesize) && ($filesize > $maximagesize)) {
-               notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL);
+               echo  sprintf( t('Image exceeds size limit of %d'), $maximagesize) . EOL;
                @unlink($src);
-               return;
+               killme();
        }
 
        $imagedata = @file_get_contents($src);
@@ -76,7 +80,9 @@ function wall_upload_post(&$a) {
        
        $smallest = 0;
 
-       $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, '<0>');
+       $defperm = '<' . $default_cid . '>';
+
+       $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
 
        if(! $r) {
                echo ( t('Image upload failed.') . EOL);
@@ -85,20 +91,38 @@ function wall_upload_post(&$a) {
 
        if($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-               $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, '<0>');
+               $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, $defperm);
                if($r) 
                        $smallest = 1;
        }
 
        if($width > 320 || $height > 320) {
                $ph->scaleImage(320);
-               $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, '<0>' );
+               $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, $defperm);
                if($r)
                        $smallest = 2;
        }
 
        $basename = basename($filename);
-       echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg\" alt=\"$basename\" /></a><br /><br />";
+
+
+/* mod Waitman Gobble NO WARRANTY */
+
+//if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)
+        if ($_REQUEST['hush']!='yeah') {
+
+               /*existing code*/
+               if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+                       echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg[/img][/url]\n\n";
+               else
+                       echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg\" alt=\"$basename\" /></a><br /><br />";
+               /*existing code*/
+               
+       } else {
+                $m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg[/img][/url]";
+               return($m);
+        }
+/* mod Waitman Gobble NO WARRANTY */
 
        killme();
        // NOTREACHED