From fba089012a3b4cd8c2969e111173bab0d58b6750 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 4 Mar 2012 18:50:32 -0800
Subject: [PATCH] correct owner info from misconfigured installs, duepuntozero
 title block misplaced in editplain mode

---
 include/items.php               | 24 ++++++++++++++++++++++++
 view/theme/duepuntozero/jot.tpl |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index a1254e165..3c55fbb4f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1747,6 +1747,18 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$datarray['parent-uri'] = $item_id;
 				$datarray['uid'] = $importer['uid'];
 				$datarray['contact-id'] = $contact['id'];
+
+				if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$contact['url']))) {
+					// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+					// but otherwise there's a possible data mixup on the sender's system.
+					// the tgroup delivery code called from item_store will correct it if it's a forum,
+					// but we're going to unconditionally correct it here so that the post will always be owned by our contact. 
+					logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+					$datarray['owner-name']   = $contact['name'];
+					$datarray['owner-link']   = $contact['url'];
+					$datarray['owner-avatar'] = $contact['thumb'];
+				}
+
 				$r = item_store($datarray);
 				continue;
 
@@ -2439,6 +2451,18 @@ function local_delivery($importer,$data) {
 			$datarray['parent-uri'] = $item_id;
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];
+
+			if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$importer['url']))) {
+				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+				// but otherwise there's a possible data mixup on the sender's system.
+				// the tgroup delivery code called from item_store will correct it if it's a forum,
+				// but we're going to unconditionally correct it here so that the post will always be owned by our contact. 
+				logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+				$datarray['owner-name']   = $importer['senderName'];
+				$datarray['owner-link']   = $importer['url'];
+				$datarray['owner-avatar'] = $importer['thumb'];
+			}
+
 			$r = item_store($datarray);
 			continue;
 		}
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl
index e356d1d8f..7117d083b 100755
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/duepuntozero/jot.tpl
@@ -14,7 +14,7 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot0title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>