X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=f179b3ca5078bbb66a717d6b8d5bf2f1875ce0f9;hb=09034ce0ee78e2906033b79f7844cd63b9bab18c;hp=ecf4752915f22a85abee826d9534122433a38fcb;hpb=95878a3e848f2498b2cb4ac39c7dd5879456e913;p=friendica.git

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
old mode 100755
new mode 100644
index ecf4752915..f179b3ca50
--- 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);
 
@@ -59,6 +60,19 @@ 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);
 	$hash = random_string();
@@ -73,7 +87,7 @@ function wall_attach_post(&$a) {
 		dbesc($filedata),
 		dbesc($created),
 		dbesc($created),
-		dbesc('<' . $page_owner_uid . '>'),
+		dbesc('<' . $page_owner_cid . '>'),
 		dbesc(''),
 		dbesc(''),
 		dbesc('')
@@ -97,8 +111,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
 }