From 457f8c3e957859972b6b0c8a235d38da0986bcbf Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 18 Aug 2011 19:14:13 -0700
Subject: use mb_strlen when iterating utf8

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/items.php')

diff --git a/include/items.php b/include/items.php
index ec519ad9b..39a61c4ad 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1635,7 +1635,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	$o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n";
 	$o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
 	$o .= '<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>' . "\r\n";
-	$o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($body) : $body) . '</content>' . "\r\n";
+	$o .= '<content type="' . $type . '" >' . xmlify((($type === 'html') ? bbcode($body) : $body)) . '</content>' . "\r\n";
 	$o .= '<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
 	if($comment)
 		$o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";
-- 
cgit v1.2.3


From 0d9d576aa642e02eb8673aa20bdf4b6a18ae6bc3 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 20 Aug 2011 04:53:11 -0700
Subject: move encryption functions to crypto file

---
 include/items.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/items.php')

diff --git a/include/items.php b/include/items.php
index 39a61c4ad..b84b71ba8 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1,8 +1,9 @@
 <?php
 
-require_once('bbcode.php');
-require_once('oembed.php');
+require_once('include/bbcode.php');
+require_once('include/oembed.php');
 require_once('include/salmon.php');
+require_once('include/crypto.php');
 
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
-- 
cgit v1.2.3


From 349ea8d4758a78e668405d3c1c2b3e0f6dd9f25a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 20 Aug 2011 17:46:33 -0700
Subject: don't generate guid if one provided wirth msg

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/items.php')

diff --git a/include/items.php b/include/items.php
index b84b71ba8..746e3b294 100644
--- a/include/items.php
+++ b/include/items.php
@@ -695,6 +695,7 @@ function item_store($arr,$force_parent = false) {
 	$arr['tag']           = ((x($arr,'tag'))           ? notags(trim($arr['tag']))           : '');
 	$arr['attach']        = ((x($arr,'attach'))        ? notags(trim($arr['attach']))        : '');
 	$arr['app']           = ((x($arr,'app'))           ? notags(trim($arr['app']))           : '');
+	$arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid());
 
 	if($arr['parent-uri'] === $arr['uri']) {
 		$parent_id = 0;
@@ -758,7 +759,6 @@ function item_store($arr,$force_parent = false) {
 		}
 	}
 
-	$arr['guid'] = get_guid();
 
 	call_hooks('post_remote',$arr);
 
-- 
cgit v1.2.3