X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=feef7c95f8f5f3cea88e23579110e81b292bd130;hb=4c717b38ae8eccaf9fa2ab4e6411b10c2d24afdf;hp=d960b6b1f44da15dabd2a14b5cc769ade2f97f73;hpb=4cba826a2fbe958e5c20c645db7e6932f8736f32;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index d960b6b1f4..feef7c95f8 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -53,6 +53,19 @@ function item_post(&$a) {
 	$str_group_deny    = perms2str($_POST['group_deny']);
 	$str_contact_deny  = perms2str($_POST['contact_deny']);
 
+	$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
+
+	if(($parent_item) && 
+		(($parent_item['private']) 
+			|| strlen($parent_item['allow_cid']) 
+			|| strlen($parent_item['allow_gid']) 
+			|| strlen($parent_item['deny_cid']) 
+			|| strlen($parent_item['deny_gid'])
+		)
+	) {
+		$private = 1;
+	}
+
 	$title             = notags(trim($_POST['title']));
 	$body              = escape_tags(trim($_POST['body']));
 	$location          = notags(trim($_POST['location']));
@@ -68,8 +81,10 @@ function item_post(&$a) {
 	// get contact info for poster
 
 	$author = null;
+	$self   = false;
 
 	if(($_SESSION['uid']) && ($_SESSION['uid'] == $profile_uid)) {
+		$self = true;
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid'])
 		);
@@ -113,6 +128,53 @@ function item_post(&$a) {
 		}
 	}
 
+
+	/**
+	 *
+	 * When a photo was uploaded into the message using the (profile wall) ajax 
+	 * uploader, The permissions are initially set to disallow anybody but the
+	 * owner from seeing it. This is because the permissions may not yet have been
+	 * set for the post. If it's private, the photo permissions should be set
+	 * appropriately. But we didn't know the final permissions on the post until
+	 * now. So now we'll look for links of uploaded messages that are in the
+	 * post and set them to the same permissions as the post itself.
+	 *
+	 */
+
+	$match = null;
+
+	if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
+		$images = $match[1];
+		if(count($images)) {
+			foreach($images as $image) {
+				if(! stristr($image,$a->get_baseurl() . '/photo/'))
+					continue;
+				$image_uri = substr($image,strrpos($image,'/') + 1);
+				$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
+				$r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
+					WHERE `resource-id` = '%s' AND `album` = '%s' ",
+					dbesc($str_contact_allow),
+					dbesc($str_group_allow),
+					dbesc($str_contact_deny),
+					dbesc($str_group_deny),
+					dbesc($image_uri),
+					dbesc( t('Wall Photos'))
+				);
+ 
+			}
+		}
+	}
+
+	/**
+	 * Fold multi-line [code] sequences
+	 */
+
+	$body = preg_replace('/\[\/code\]\s*\[code\]/m',"\n",$body); 
+
+	/**
+	 * Look for any tags and linkify them
+	 */
+
 	$str_tags = '';
 	$inform   = '';
 
@@ -121,6 +183,14 @@ function item_post(&$a) {
 
 	if(count($tags)) {
 		foreach($tags as $tag) {
+			if(strpos($tag,'#') === 0) {
+				$basetag = str_replace('_',' ',substr($tag,1));
+				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+				if(strlen($str_tags))
+					$str_tags .= ',';
+				$str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+				continue;
+			}
 			if(strpos($tag,'@') === 0) {
 				$name = substr($tag,1);
 				if((strpos($name,'@')) || (strpos($name,'http://'))) {
@@ -155,16 +225,17 @@ function item_post(&$a) {
 					}
 					if(count($r)) {
 						$profile = $r[0]['url'];
+						$newname = $r[0]['name'];
 						if(strlen($inform))
 							$inform .= ',';
 						$inform .= 'cid:' . $r[0]['id'];
 					}
 				}
 				if($profile) {
-					$body = str_replace($name,'[url=' . $profile . ']' . $newname	. '[/url]', $body);
+					$body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname	. '[/url]', $body);
+					$profile = str_replace(',','%2c',$profile);
 					if(strlen($str_tags))
 						$str_tags .= ',';
-					$profile = str_replace(',','%2c',$profile);
 					$str_tags .= '@[url=' . $profile . ']' . $newname	. '[/url]';
 				}
 			}
@@ -184,41 +255,85 @@ function item_post(&$a) {
 
 	$uri = item_new_uri($a->get_hostname(),$profile_uid);
 
+	$datarray = array();
+	$datarray['uid']           = $profile_uid;
+	$datarray['type']          = $post_type;
+	$datarray['wall']          = $wall;
+	$datarray['gravity']       = $gravity;
+	$datarray['contact-id']    = $contact_id;
+	$datarray['owner-name']    = $contact_record['name'];
+	$datarray['owner-link']    = $contact_record['url'];
+	$datarray['owner-avatar']  = $contact_record['thumb'];
+	$datarray['author-name']   = $author['name'];
+	$datarray['author-link']   = $author['url'];
+	$datarray['author-avatar'] = $author['thumb'];
+	$datarray['created']       = datetime_convert();
+	$datarray['edited']        = datetime_convert();
+	$datarray['changed']       = datetime_convert();
+	$datarray['uri']           = $uri;
+	$datarray['title']         = $title;
+	$datarray['body']          = $body;
+	$datarray['location']      = $location;
+	$datarray['coord']         = $coord;
+	$datarray['tag']           = $str_tags;
+	$datarray['inform']        = $inform;
+	$datarray['verb']          = $verb;
+	$datarray['allow_cid']     = $str_contact_allow;
+	$datarray['allow_gid']     = $str_group_allow;
+	$datarray['deny_cid']      = $str_contact_deny;
+	$datarray['deny_gid']      = $str_group_deny;
+	$datarray['private']       = $private;
+
+	/**
+	 * These fields are for the convenience of plugins...
+	 * 'self' if true indicates the owner is posting on their own wall
+	 * If parent is 0 it is a top-level post.
+	 */
+
+	$datarray['parent']        = $parent;
+	$datarray['self']          = $self;
+
+
+	call_hooks('post_local',$datarray);
+
 	$r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, 
-		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
-		VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
-		intval($profile_uid),
-		dbesc($post_type),
-		intval($wall),
-		intval($gravity),
-		intval($contact_id),
-		dbesc($contact_record['name']),
-		dbesc($contact_record['url']),
-		dbesc($contact_record['thumb']),
-		dbesc($author['name']),
-		dbesc($author['url']),
-		dbesc($author['thumb']),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		dbesc($uri),
-		dbesc($title),
-		dbesc($body),
-		dbesc($location),
-		dbesc($coord),
-		dbesc($str_tags),
-		dbesc($inform),
-		dbesc($verb),
-		dbesc($str_contact_allow),
-		dbesc($str_group_allow),
-		dbesc($str_contact_deny),
-		dbesc($str_group_deny)
+		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private` )
+		VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
+		intval($datarray['uid']),
+		dbesc($datarray['type']),
+		intval($datarray['wall']),
+		intval($datarray['gravity']),
+		intval($datarray['contact-id']),
+		dbesc($datarray['owner-name']),
+		dbesc($datarray['owner-link']),
+		dbesc($datarray['owner-avatar']),
+		dbesc($datarray['author-name']),
+		dbesc($datarray['author-link']),
+		dbesc($datarray['author-avatar']),
+		dbesc($datarray['created']),
+		dbesc($datarray['edited']),
+		dbesc($datarray['changed']),
+		dbesc($datarray['uri']),
+		dbesc($datarray['title']),
+		dbesc($datarray['body']),
+		dbesc($datarray['location']),
+		dbesc($datarray['coord']),
+		dbesc($datarray['tag']),
+		dbesc($datarray['inform']),
+		dbesc($datarray['verb']),
+		dbesc($datarray['allow_cid']),
+		dbesc($datarray['allow_gid']),
+		dbesc($datarray['deny_cid']),
+		dbesc($datarray['deny_gid']),
+		intval($datarray['private'])
 	);
+
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-		dbesc($uri));
+		dbesc($datarray['uri']));
 	if(count($r)) {
 		$post_id = $r[0]['id'];
+		logger('mod_item: saved item ' . $post_id);
 
 		if($parent) {
 
@@ -229,14 +344,14 @@ function item_post(&$a) {
 			);
 
 			// Inherit ACL's from the parent item.
-			// TODO merge with subsequent UPDATE operation and save a db write 
 
-			$r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
+			$r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d
 				WHERE `id` = %d LIMIT 1",
 				dbesc($parent_item['allow_cid']),
 				dbesc($parent_item['allow_gid']),
 				dbesc($parent_item['deny_cid']),
 				dbesc($parent_item['deny_gid']),
+				intval($parent_item['private']),
 				intval($post_id)
 			);
 
@@ -251,7 +366,8 @@ function item_post(&$a) {
 					'$username' => $user['username'],
 					'$email' => $user['email'],
 					'$from' => $from,
-					'$body' => strip_tags(bbcode($body))
+					'$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					'$body' => strip_tags(bbcode($datarray['body']))
 				));
 
 				$res = mail($user['email'], $from . t(" commented on your item at ") . $a->config['sitename'],
@@ -273,7 +389,8 @@ function item_post(&$a) {
 					'$username' => $user['username'],
 					'$email' => $user['email'],
 					'$from' => $from,
-					'$body' => strip_tags(bbcode($body))
+					'$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					'$body' => strip_tags(bbcode($datarray['body']))
 				));
 
 				$res = mail($user['email'], $from . t(" posted on your profile wall at ") . $a->config['sitename'],
@@ -302,13 +419,24 @@ function item_post(&$a) {
 
 	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
+	logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &");
+
 	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &",
 		array(),$foo));
 
+	$datarray['id'] = $post_id;
+
+	call_hooks('post_local_end', $datarray);
+ 
+
 	goaway($a->get_baseurl() . "/" . $_POST['return'] );
 	return; // NOTREACHED
 }
 
+
+
+
+
 function item_content(&$a) {
 
 	if((! local_user()) && (! remote_user()))