merged multipart email changes

1 files changed, 106 insertions, 79 deletions

diff --git a/mod/item.php b/mod/item.php
index ad3298592..0b5e32e88 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -51,7 +51,7 @@ function item_post(&$a) {
 	}
 
 	$profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
-
+	$post_id     = ((x($_POST['post_id']))    ? intval($_POST['post_id'])     : 0);
 
 	if(! can_write_wall($a,$profile_uid)) {
 		notice( t('Permission denied.') . EOL) ;
@@ -60,6 +60,21 @@ function item_post(&$a) {
 		killme();
 	}
 
+
+	// is this an edited post?
+
+	$orig_post = null;
+
+	if($post_id) {
+		$i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			intval($profile_uid),
+			intval($post_id)
+		);
+		if(! count($i))
+			killme();
+		$orig_post = $i[0];
+	}
+
 	$user = null;
 
 	$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
@@ -68,37 +83,53 @@ function item_post(&$a) {
 	if(count($r))
 		$user = $r[0];
 	
-
-	$str_group_allow   = perms2str($_POST['group_allow']);
-	$str_contact_allow = perms2str($_POST['contact_allow']);
-	$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;
+	if($orig_post) {
+		$str_group_allow   = $orig_post['allow_gid'];
+		$str_contact_allow = $orig_post['allow_cid'];
+		$str_group_deny    = $orig_post['deny_gid'];
+		$str_contact_deny  = $orig_post['deny_cid'];
+		$title             = $orig_post['title'];
+		$location          = $orig_post['location'];
+		$coord             = $orig_post['coord'];
+		$verb              = $orig_post['verb'];
+		$emailcc           = $orig_post['emailcc'];
+
+		$body              = escape_tags(trim($_POST['body']));
+		$private           = $orig_post['private'];
+		$pubmail_enable    = $orig_post['pubmail'];
 	}
+	else {
+		$str_group_allow   = perms2str($_POST['group_allow']);
+		$str_contact_allow = perms2str($_POST['contact_allow']);
+		$str_group_deny    = perms2str($_POST['group_deny']);
+		$str_contact_deny  = perms2str($_POST['contact_deny']);
+		$title             = notags(trim($_POST['title']));
+		$location          = notags(trim($_POST['location']));
+		$coord             = notags(trim($_POST['coord']));
+		$verb              = notags(trim($_POST['verb']));
+		$emailcc           = notags(trim($_POST['emailcc']));
+
+		$body              = escape_tags(trim($_POST['body']));
+		$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;
+		}
+	
+		$pubmail_enable    = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0);
 
-	$title             = notags(trim($_POST['title']));
-	$body              = escape_tags(trim($_POST['body']));
-	$location          = notags(trim($_POST['location']));
-	$coord             = notags(trim($_POST['coord']));
-	$verb              = notags(trim($_POST['verb']));
-	$emailcc           = notags(trim($_POST['emailcc']));
-
-	if(! strlen($body)) {
-		notice( t('Empty post discarded.') . EOL );
-		if(x($_POST,'return')) 
-			goaway($a->get_baseurl() . "/" . $_POST['return'] );
-		killme();
+		if(! strlen($body)) {
+			notice( t('Empty post discarded.') . EOL );
+			if(x($_POST,'return')) 
+				goaway($a->get_baseurl() . "/" . $_POST['return'] );
+			killme();
+		}
 	}
 
 	// get contact info for poster
@@ -151,7 +182,6 @@ function item_post(&$a) {
 		}
 	}
 
-
 	/**
 	 *
 	 * When a photo was uploaded into the message using the (profile wall) ajax 
@@ -212,6 +242,8 @@ function item_post(&$a) {
 	if(count($tags)) {
 		foreach($tags as $tag) {
 			if(strpos($tag,'#') === 0) {
+				if(strpos($tag,'[url='))
+					continue;
 				$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))
@@ -220,6 +252,8 @@ function item_post(&$a) {
 				continue;
 			}
 			if(strpos($tag,'@') === 0) {
+				if(strpos($tag,'[url='))
+					continue;
 				$stat = false;
 				$name = substr($tag,1);
 				if((strpos($name,'@')) || (strpos($name,'http://'))) {
@@ -283,15 +317,13 @@ function item_post(&$a) {
 							$str_tags .= ',';
 						$str_tags .= '@[url=' . $alias . ']' . $newname	. '[/url]';
 					}
-
 				}
 			}
 		}
 	}
 
-
-
 	$wall = 0;
+
 	if($post_type === 'wall' || $post_type === 'wall-comment')
 		$wall = 1;
 
@@ -332,6 +364,7 @@ function item_post(&$a) {
 	$datarray['deny_cid']      = $str_contact_deny;
 	$datarray['deny_gid']      = $str_group_deny;
 	$datarray['private']       = $private;
+	$datarray['pubmail']       = $pubmail_enable;
 
 	/**
 	 * These fields are for the convenience of plugins...
@@ -342,13 +375,35 @@ function item_post(&$a) {
 	$datarray['parent']        = $parent;
 	$datarray['self']          = $self;
 
+	if($orig_post)
+		$datarray['edit']      = true;
 
 	call_hooks('post_local',$datarray);
 
+
+	if($orig_post) {
+		$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			dbesc($body),
+			dbesc(datetime_convert()),
+			intval($post_id),
+			intval($profile_uid)
+		);
+
+		proc_run('php', "include/notifier.php", 'edit_post', "$post_id");
+		if((x($_POST,'return')) && strlen($_POST['return'])) {
+			logger('return: ' . $_POST['return']);
+			goaway($a->get_baseurl() . "/" . $_POST['return'] );
+		}
+		killme();
+	}
+	else
+		$post_id = 0;
+
+
 	$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`, `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 )",
+		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail` )
+		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, %d )",
 		intval($datarray['uid']),
 		dbesc($datarray['type']),
 		intval($datarray['wall']),
@@ -375,7 +430,8 @@ function item_post(&$a) {
 		dbesc($datarray['allow_gid']),
 		dbesc($datarray['deny_cid']),
 		dbesc($datarray['deny_gid']),
-		intval($datarray['private'])
+		intval($datarray['private']),
+		intval($datarray['pubmail'])
 	);
 
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
@@ -408,21 +464,7 @@ function item_post(&$a) {
 			if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) {
 				require_once('bbcode.php');
 				$from = $author['name'];
-				/*
-				$tpl = load_view_file('view/cmnt_received_eml.tpl');			
-				$email_tpl = replace_macros($tpl, array(
-					'$sitename' => $a->config['sitename'],
-					'$siteurl' =>  $a->get_baseurl(),
-					'$username' => $user['username'],
-					'$email' => $user['email'],
-					'$from' => $from,
-					'$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'],
-					$email_tpl,t("From: Administrator@") . $a->get_hostname() );	
-				*/
 				// name of the automated email sender
 				$msg['notificationfromname']	= stripslashes($datarray['author-name']);;
 				// noreply address to send from
@@ -439,7 +481,7 @@ function item_post(&$a) {
 					= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
 
 				// load the template for private message notifications
-				$tpl = load_view_file('view/cmnt_received_html_body_eml.tpl');
+				$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
 				$email_html_body_tpl = replace_macros($tpl,array(
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
@@ -452,7 +494,7 @@ function item_post(&$a) {
 				));
 			
 				// load the template for private message notifications
-				$tpl = load_view_file('view/cmnt_received_text_body_eml.tpl');
+				$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
 				$email_text_body_tpl = replace_macros($tpl,array(
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
@@ -485,22 +527,6 @@ function item_post(&$a) {
 			if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) {
 				require_once('bbcode.php');
 				$from = $author['name'];
-				/*
-				$tpl = load_view_file('view/wall_received_eml.tpl');			
-				$email_tpl = replace_macros($tpl, array(
-					'$sitename' => $a->config['sitename'],
-					'$siteurl' =>  $a->get_baseurl(),
-					'$username' => $user['username'],
-					'$email' => $user['email'],
-					'$from' => $from,
-					'$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'],
-					$email_tpl,t("From: Administrator@") . $a->get_hostname() );
-				*/
-												
 							
 				// name of the automated email sender
 				$msg['notificationfromname']	= $from;
@@ -583,7 +609,8 @@ function item_post(&$a) {
 
 	proc_run('php', "include/notifier.php", $notify_type, "$post_id");
 
-	$datarray['id'] = $post_id;
+	$datarray['id']    = $post_id;
+	$datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id;
 
 	call_hooks('post_local_end', $datarray);
 
@@ -594,13 +621,12 @@ function item_post(&$a) {
 				$addr = trim($recip);
 				if(! strlen($addr))
 					continue;
-				$disclaimer = '<hr />' . t('This message was sent to you by ') . $a->user['username'] 
-					. t(', a member of the Friendika social network.') . '<br />';
-				$disclaimer .= t('You may visit them online at') . ' ' 
-					. $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '<br />';
-				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '<br />'; 
+				$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) 
+					. '<br />';
+				$disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
+				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; 
 
-				$subject  = '[Friendika]' . ' ' . $a->user['username'] . ' ' . t('posted an update.');
+				$subject  = '[Friendika]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']);
 				$headers  = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n";
 				$headers .= 'MIME-Version: 1.0' . "\n";
 				$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
@@ -640,7 +666,7 @@ function item_content(&$a) {
 
 	require_once('include/security.php');
 
-	$uid = $_SESSION['uid'];
+	$uid = local_user();
 
 	if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
 
@@ -716,7 +742,8 @@ function item_content(&$a) {
 			// send the notification upstream/downstream as the case may be
 
 			proc_run('php',"include/notifier.php","drop","$drop_id");
-
+// We seem to lose the return url occasionally. Have not been able to reliably duplicate
+//			logger('drop_return_url: ' . $_SESSION['return_url']);
 			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
 			//NOTREACHED
 		}
@@ -726,4 +753,4 @@ function item_content(&$a) {
 			//NOTREACHED
 		}
 	}
-}
\ No newline at end of file
+}