X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=f341cc9cdaa837186d2b10d4efad4964f10f6fe5;hb=e2e6b56c448da3a67fa25df118bbb7cbc3239664;hp=278c2135476648cc2723ac64f7420877cc45fb24;hpb=cafd4003522a472d2709569ea5eb5f80b817af23;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
old mode 100755
new mode 100644
index 278c213547..f341cc9cda
--- 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;
 			}
 		}
 	}
@@ -76,7 +80,7 @@ function wall_upload_post(&$a) {
 	
 	$smallest = 0;
 
-	$defperm = '<' . $page_owner_uid . '>';
+	$defperm = '<' . $default_cid . '>';
 
 	$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
 
@@ -101,10 +105,24 @@ function wall_upload_post(&$a) {
 
 	$basename = basename($filename);
 
-	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 />";
+
+/* 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