From 6b3ea9dc141e668e4f88e20e864daf845b349995 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 25 Jan 2014 03:50:47 +0100
Subject: API My wall posts

---
 include/api.php | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'include/api.php')

diff --git a/include/api.php b/include/api.php
index 463d29cf8..8cb2c3152 100644
--- a/include/api.php
+++ b/include/api.php
@@ -7,6 +7,7 @@ require_once("oauth.php");
 require_once("html2plain.php");
 require_once('include/security.php');
 require_once('include/photos.php');
+require_once('include/items.php');
 
 	/*
 	 *
@@ -1244,24 +1245,33 @@ require_once('include/photos.php');
 		if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
 		if ($exclude_replies > 0)  $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
 
-		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn_id`, `contact`.`self`,
-			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item`, `contact`
-			WHERE `item`.`uid` = %d
-			AND `item`.`contact-id` = %d
-			AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
-			AND `contact`.`id` = `item`.`contact-id`
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			$sql_extra
-			AND `item`.`id`>%d
-			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
-			intval(api_user()),
-			intval($user_info['id']),
-			intval($since_id),
-			intval($start),	intval($count)
-		);
+// 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+// 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+// 			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn_id`, `contact`.`self`,
+// 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+// 			FROM `item`, `contact`
+// 			WHERE `item`.`uid` = %d
+// 			AND `item`.`contact-id` = %d
+// 			AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+// 			AND `contact`.`id` = `item`.`contact-id`
+// 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+// 			$sql_extra
+// 			AND `item`.`id`>%d
+// 			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+// 			intval(api_user()),
+// 			intval($user_info['id']),
+// 			intval($since_id),
+// 			intval($start),	intval($count)
+// 		);
+
+		$r = items_fetch(array(
+		          'uid' => api_user(),
+		          'cid' => $user_info['id'],
+		          'since_id' => $since_id,
+		          'start' => $start,
+		          'records' => $count,
+		          'wall' => 1));
+
 
 		$ret = api_format_items($r,$user_info);
 
-- 
cgit v1.2.3


From b71e855c5b8abc782c6890d4865ea62e2f72a804 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 25 Jan 2014 13:44:31 +0100
Subject: remove wall restriction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

original didn’t have that
---
 include/api.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/api.php')

diff --git a/include/api.php b/include/api.php
index 8cb2c3152..3ab0aad27 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1269,8 +1269,7 @@ require_once('include/items.php');
 		          'cid' => $user_info['id'],
 		          'since_id' => $since_id,
 		          'start' => $start,
-		          'records' => $count,
-		          'wall' => 1));
+		          'records' => $count));
 
 
 		$ret = api_format_items($r,$user_info);
-- 
cgit v1.2.3


From a25b8c951ba7c1f2f43c56b136bcea9731c6ab32 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 25 Jan 2014 22:56:15 +0100
Subject: Check user_info['self] in api user_timeline

---
 include/api.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'include/api.php')

diff --git a/include/api.php b/include/api.php
index 3ab0aad27..8ceae7787 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1263,15 +1263,24 @@ require_once('include/items.php');
 // 			intval($since_id),
 // 			intval($start),	intval($count)
 // 		);
-
+	  if ($user_info['self']==1) {
 		$r = items_fetch(array(
 		          'uid' => api_user(),
 		          'cid' => $user_info['id'],
 		          'since_id' => $since_id,
 		          'start' => $start,
-		          'records' => $count));
-
-
+		          'records' => $count,
+		          'wall' => 1));
+		}
+		else {
+		$r = items_fetch(array(
+		          'uid' => api_user(),
+		          'cid' => $user_info['id'],
+		          'since_id' => $since_id,
+		          'start' => $start,
+		          'records' => $count));		
+        }
+        
 		$ret = api_format_items($r,$user_info);
 
 
-- 
cgit v1.2.3