From 944f897d308a46a8f9ac80a089516f29eb096717 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 8 Apr 2012 17:23:38 +0200
Subject: API: Basic support of the identica client added.

---
 include/api.php | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index 968a64a6d..5053a8ad5 100644
--- a/include/api.php
+++ b/include/api.php
@@ -121,6 +121,7 @@
 				if (strpos($a->query_string, ".json")>0) $type="json";
 				if (strpos($a->query_string, ".rss")>0) $type="rss";
 				if (strpos($a->query_string, ".atom")>0) $type="atom";
+				if (strpos($a->query_string, ".as")>0) $type="as";
 
 				$r = call_user_func($info['func'], $a, $type);
 				if ($r===false) return;
@@ -144,6 +145,12 @@
 						header ("Content-Type: application/atom+xml");
 						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 						break;
+					case "as":
+						//header ("Content-Type: application/json");
+						//foreach($r as $rr)
+						//    return json_encode($rr);
+						return json_encode($r);
+						break;
 
 				}
 				//echo "<pre>"; var_dump($r); die();
@@ -737,6 +744,71 @@
 			case "atom":
 			case "rss":
 				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = array();
+				$as['title'] = $a->config['sitename']." Public Timeline";
+				$items = array();
+				foreach ($ret as $item) {
+					$singleitem["actor"]["displayName"] = $item["user"]["name"];
+					$singleitem["actor"]["id"] = $item["user"]["contact_url"];
+					$avatar[0]["url"] = $item["user"]["profile_image_url"];
+					$avatar[0]["rel"] = "avatar";
+					$avatar[0]["type"] = "";
+					$avatar[0]["width"] = 96;
+					$avatar[0]["height"] = 96;
+					$avatar[1]["url"] = $item["user"]["profile_image_url"];
+					$avatar[1]["rel"] = "avatar";
+					$avatar[1]["type"] = "";
+					$avatar[1]["width"] = 48;
+					$avatar[1]["height"] = 48;
+					$avatar[2]["url"] = $item["user"]["profile_image_url"];
+					$avatar[2]["rel"] = "avatar";
+					$avatar[2]["type"] = "";
+					$avatar[2]["width"] = 24;
+					$avatar[2]["height"] = 24;
+					$singleitem["actor"]["avatarLinks"] = $avatar;
+
+					$singleitem["actor"]["image"]["url"] = $item["user"]["profile_image_url"];
+					$singleitem["actor"]["image"]["rel"] = "avatar";
+					$singleitem["actor"]["image"]["type"] = "";
+					$singleitem["actor"]["image"]["width"] = 96;
+					$singleitem["actor"]["image"]["height"] = 96;
+					$singleitem["actor"]["type"] = "person";
+					$singleitem["actor"]["url"] = $item["person"]["contact_url"];
+					$singleitem["actor"]["statusnet:profile_info"]["local_id"] = $item["user"]["id"];
+					$singleitem["actor"]["statusnet:profile_info"]["following"] = "false"; // $item["user"]["following"]
+					$singleitem["actor"]["statusnet:profile_info"]["blocking"] = "false";
+					$singleitem["actor"]["contact"]["preferredUsername"] = $item["user"]["screen_name"];
+					$singleitem["actor"]["contact"]["displayName"] = $item["user"]["name"];
+					$singleitem["actor"]["contact"]["addresses"] = "";
+
+					$singleitem["body"] = $item["text"];
+					$singleitem["object"]["displayName"] = $item["text"];
+					$singleitem["object"]["id"] = $item["url"];
+					$singleitem["object"]["type"] = "note";
+					$singleitem["object"]["url"] = $item["url"];
+					//$singleitem["context"] =;
+					$singleitem["postedTime"] = date("c", strtotime($item["published"]));
+					$singleitem["provider"]["objectType"] = "service";
+					$singleitem["provider"]["displayName"] = "Test";
+					$singleitem["provider"]["url"] = "http://test.tld";
+					$singleitem["title"] = $item["text"];
+					$singleitem["verb"] = "post";
+					$singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
+					$singleitem["statusnet:notice_info"]["source"] = $item["source"];
+					$singleitem["statusnet:notice_info"]["favorite"] = "false";
+					$singleitem["statusnet:notice_info"]["repeated"] = "false";
+					//$singleitem["original"] = $item;
+					$items[] = $singleitem;
+				}
+				$as['items'] = $items;
+				$link->url = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+				$link->rel = "alternate";
+				$link->type = "text/html";
+				$as['link'][] = $link;
+				return($as);
+				break;
 		}
 				
 		return  api_apply_template("timeline", $type, $data);
-- 
cgit v1.2.3


From 763729f11a13fa83c45eb696ec1f2d28cd612479 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 8 Apr 2012 17:51:05 +0200
Subject: API: Now mentions could work as well - only my client doesn't really
 work

---
 include/api.php | 133 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 72 insertions(+), 61 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index 5053a8ad5..d06862e7a 100644
--- a/include/api.php
+++ b/include/api.php
@@ -746,67 +746,7 @@
 				$data = api_rss_extra($a, $data, $user_info);
 				break;
 			case "as":
-				$as = array();
-				$as['title'] = $a->config['sitename']." Public Timeline";
-				$items = array();
-				foreach ($ret as $item) {
-					$singleitem["actor"]["displayName"] = $item["user"]["name"];
-					$singleitem["actor"]["id"] = $item["user"]["contact_url"];
-					$avatar[0]["url"] = $item["user"]["profile_image_url"];
-					$avatar[0]["rel"] = "avatar";
-					$avatar[0]["type"] = "";
-					$avatar[0]["width"] = 96;
-					$avatar[0]["height"] = 96;
-					$avatar[1]["url"] = $item["user"]["profile_image_url"];
-					$avatar[1]["rel"] = "avatar";
-					$avatar[1]["type"] = "";
-					$avatar[1]["width"] = 48;
-					$avatar[1]["height"] = 48;
-					$avatar[2]["url"] = $item["user"]["profile_image_url"];
-					$avatar[2]["rel"] = "avatar";
-					$avatar[2]["type"] = "";
-					$avatar[2]["width"] = 24;
-					$avatar[2]["height"] = 24;
-					$singleitem["actor"]["avatarLinks"] = $avatar;
-
-					$singleitem["actor"]["image"]["url"] = $item["user"]["profile_image_url"];
-					$singleitem["actor"]["image"]["rel"] = "avatar";
-					$singleitem["actor"]["image"]["type"] = "";
-					$singleitem["actor"]["image"]["width"] = 96;
-					$singleitem["actor"]["image"]["height"] = 96;
-					$singleitem["actor"]["type"] = "person";
-					$singleitem["actor"]["url"] = $item["person"]["contact_url"];
-					$singleitem["actor"]["statusnet:profile_info"]["local_id"] = $item["user"]["id"];
-					$singleitem["actor"]["statusnet:profile_info"]["following"] = "false"; // $item["user"]["following"]
-					$singleitem["actor"]["statusnet:profile_info"]["blocking"] = "false";
-					$singleitem["actor"]["contact"]["preferredUsername"] = $item["user"]["screen_name"];
-					$singleitem["actor"]["contact"]["displayName"] = $item["user"]["name"];
-					$singleitem["actor"]["contact"]["addresses"] = "";
-
-					$singleitem["body"] = $item["text"];
-					$singleitem["object"]["displayName"] = $item["text"];
-					$singleitem["object"]["id"] = $item["url"];
-					$singleitem["object"]["type"] = "note";
-					$singleitem["object"]["url"] = $item["url"];
-					//$singleitem["context"] =;
-					$singleitem["postedTime"] = date("c", strtotime($item["published"]));
-					$singleitem["provider"]["objectType"] = "service";
-					$singleitem["provider"]["displayName"] = "Test";
-					$singleitem["provider"]["url"] = "http://test.tld";
-					$singleitem["title"] = $item["text"];
-					$singleitem["verb"] = "post";
-					$singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
-					$singleitem["statusnet:notice_info"]["source"] = $item["source"];
-					$singleitem["statusnet:notice_info"]["favorite"] = "false";
-					$singleitem["statusnet:notice_info"]["repeated"] = "false";
-					//$singleitem["original"] = $item;
-					$items[] = $singleitem;
-				}
-				$as['items'] = $items;
-				$link->url = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
-				$link->rel = "alternate";
-				$link->type = "text/html";
-				$as['link'][] = $link;
+				$as = api_format_as($a, $ret, $user_info);
 				return($as);
 				break;
 		}
@@ -989,6 +929,12 @@
 			case "atom":
 			case "rss":
 				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as["title"] = $a->config['sitename']." Mentions";
+				return($as);
+				break;
 		}
 				
 		return  api_apply_template("timeline", $type, $data);
@@ -1107,6 +1053,71 @@
 
 	api_register_func('api/favorites','api_favorites', true);
 
+	function api_format_as($a, $ret, $user_info) {
+
+		$as = array();
+		$as['title'] = $a->config['sitename']." Public Timeline";
+		$items = array();
+		foreach ($ret as $item) {
+			$singleitem["actor"]["displayName"] = $item["user"]["name"];
+			$singleitem["actor"]["id"] = $item["user"]["contact_url"];
+			$avatar[0]["url"] = $item["user"]["profile_image_url"];
+			$avatar[0]["rel"] = "avatar";
+			$avatar[0]["type"] = "";
+			$avatar[0]["width"] = 96;
+			$avatar[0]["height"] = 96;
+			$avatar[1]["url"] = $item["user"]["profile_image_url"];
+			$avatar[1]["rel"] = "avatar";
+			$avatar[1]["type"] = "";
+			$avatar[1]["width"] = 48;
+			$avatar[1]["height"] = 48;
+			$avatar[2]["url"] = $item["user"]["profile_image_url"];
+			$avatar[2]["rel"] = "avatar";
+			$avatar[2]["type"] = "";
+			$avatar[2]["width"] = 24;
+			$avatar[2]["height"] = 24;
+			$singleitem["actor"]["avatarLinks"] = $avatar;
+
+			$singleitem["actor"]["image"]["url"] = $item["user"]["profile_image_url"];
+			$singleitem["actor"]["image"]["rel"] = "avatar";
+			$singleitem["actor"]["image"]["type"] = "";
+			$singleitem["actor"]["image"]["width"] = 96;
+			$singleitem["actor"]["image"]["height"] = 96;
+			$singleitem["actor"]["type"] = "person";
+			$singleitem["actor"]["url"] = $item["person"]["contact_url"];
+			$singleitem["actor"]["statusnet:profile_info"]["local_id"] = $item["user"]["id"];
+			$singleitem["actor"]["statusnet:profile_info"]["following"] = $item["user"]["following"] ? "true" : "false";
+			$singleitem["actor"]["statusnet:profile_info"]["blocking"] = "false";
+			$singleitem["actor"]["contact"]["preferredUsername"] = $item["user"]["screen_name"];
+			$singleitem["actor"]["contact"]["displayName"] = $item["user"]["name"];
+			$singleitem["actor"]["contact"]["addresses"] = "";
+
+			$singleitem["body"] = $item["text"];
+			$singleitem["object"]["displayName"] = $item["text"];
+			$singleitem["object"]["id"] = $item["url"];
+			$singleitem["object"]["type"] = "note";
+			$singleitem["object"]["url"] = $item["url"];
+			//$singleitem["context"] =;
+			$singleitem["postedTime"] = date("c", strtotime($item["published"]));
+			$singleitem["provider"]["objectType"] = "service";
+			$singleitem["provider"]["displayName"] = "Test";
+			$singleitem["provider"]["url"] = "http://test.tld";
+			$singleitem["title"] = $item["text"];
+			$singleitem["verb"] = "post";
+			$singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
+				$singleitem["statusnet:notice_info"]["source"] = $item["source"];
+				$singleitem["statusnet:notice_info"]["favorite"] = "false";
+				$singleitem["statusnet:notice_info"]["repeated"] = "false";
+				//$singleitem["original"] = $item;
+				$items[] = $singleitem;
+		}
+		$as['items'] = $items;
+		$link->url = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+		$link->rel = "alternate";
+		$link->type = "text/html";
+		$as['link'][] = $link;
+		return($as);
+	}
 	
 	function api_format_items($r,$user_info) {
 
-- 
cgit v1.2.3


From 269f21ddc13c2817b5ba9d8c69814a8f46c1dd6c Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 8 Apr 2012 20:19:14 +0200
Subject: API: Added Public Timeline

---
 include/api.php | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 85 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index d06862e7a..ab83d63be 100644
--- a/include/api.php
+++ b/include/api.php
@@ -747,6 +747,8 @@
 				break;
 			case "as":
 				$as = api_format_as($a, $ret, $user_info);
+				$as['title'] = $a->config['sitename']." Home Timeline";
+				$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
 				return($as);
 				break;
 		}
@@ -756,6 +758,85 @@
 	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
 	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 
+	function api_statuses_public_timeline(&$a, $type){
+		if (local_user()===false) return false;
+				
+		$user_info = api_get_user($a);
+		// get last newtork messages
+
+
+		// params
+		$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+		if ($page<0) $page=0;
+		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		
+		$start = $page*$count;
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		if ($max_id > 0)
+			$sql_extra = 'AND `item`.`id` <= '.intval($max_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`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+			AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 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($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`.`self`, `contact`.`writable`, 
+                	`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+                	`user`.`nickname`, `user`.`hidewall`
+                	FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                	LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+                	WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                	AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+                	AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+                	AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+                	AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`>%d
+                	ORDER BY `received` DESC LIMIT %d, %d ",
+			intval($since_id),
+                	intval($start),
+                	intval($count));
+
+		$ret = api_format_items($r,$user_info);
+
+		
+		$data = array('$statuses' => $ret);
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as['title'] = $a->config['sitename']." Public Timeline";
+				$as['link']['url'] = $a->get_baseurl()."/";
+				return($as);
+				break;
+		}
+				
+		return  api_apply_template("timeline", $type, $data);
+	}
+	api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
+
 	/**
 	 * 
 	 */
@@ -933,6 +1014,7 @@
 			case "as":
 				$as = api_format_as($a, $ret, $user_info);
 				$as["title"] = $a->config['sitename']." Mentions";
+				$as['link']['url'] = $a->get_baseurl()."/";
 				return($as);
 				break;
 		}
@@ -1112,10 +1194,9 @@
 				$items[] = $singleitem;
 		}
 		$as['items'] = $items;
-		$link->url = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
-		$link->rel = "alternate";
-		$link->type = "text/html";
-		$as['link'][] = $link;
+		$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+		$as['link']['rel'] = "alternate";
+		$as['link']['type'] = "text/html";
 		return($as);
 	}
 	
@@ -1532,7 +1613,6 @@ Not implemented by now:
 favorites
 favorites/create
 favorites/destroy
-statuses/public_timeline
 statuses/retweets_of_me
 friendships/create
 friendships/destroy
-- 
cgit v1.2.3


From fe257a20324fe68838e5829e19d18777045a41b4 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 9 Apr 2012 12:54:02 +0200
Subject: html2plain: changed behaviour for the "hr" element.

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

(limited to 'include')

diff --git a/include/html2plain.php b/include/html2plain.php
index 7aa20500a..21261327d 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -157,7 +157,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
 	//node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n");
 	node2bbcode($doc, 'li', array(), "\n* ", "\n");
 
-	node2bbcode($doc, 'hr', array(), str_repeat("-", 70), "");
+	node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", "");
 
 	node2bbcode($doc, 'tr', array(), "\n", "");
 	node2bbcode($doc, 'td', array(), "\t", "");
-- 
cgit v1.2.3


From c88c2515e43f7a446a9b358fb657290a8a6c847a Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 11 Apr 2012 19:31:01 +0200
Subject: API: Improved the timeline. Several (disabled) tests with caching of
 photos.

---
 include/api.php          | 15 ++++++++++++---
 include/conversation.php |  5 -----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index ab83d63be..0885a1434 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1233,8 +1233,17 @@
 				$in_reply_to_status_id = 0;
 			}
 
+			// Workaround for ostatus messages where the title is identically to the body
+			$statusbody = trim(html2plain(bbcode($item['body']), 0));
+			$statustitle = trim($item['title']);
+
+			if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
+				$statustext = trim($statusbody);
+			else
+				$statustext = trim($statustitle."\n\n".$statusbody);
+
 			$status = array(
-				'text'		=> trim($item['title']." \n".html2plain(bbcode($item['body']), 0)),
+				'text'		=> $statustext,
 				'truncated' => False,
 				'created_at'=> api_date($item['created']),
 				'in_reply_to_status_id' => $in_reply_to_status_id,
@@ -1245,8 +1254,8 @@
 				'geo' => '',
 				'favorited' => $item['starred'] ? true : false,
 				'user' =>  $status_user ,
-				'statusnet_html'		=> bbcode($item['body']),
-				'statusnet_conversation_id'	=> 0,
+				'statusnet_html'		=> trim(bbcode($item['body'])),
+				'statusnet_conversation_id'	=> $item['parent'],
 			);
 
 			// Seesmic doesn't like the following content
diff --git a/include/conversation.php b/include/conversation.php
index df92a40ed..a32cbeb8b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -626,10 +626,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				else
 					$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-
-
-
-
 				$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 				$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
@@ -1089,4 +1085,3 @@ function render_location_google($item) {
 	}
 	return $location;
 }
-
-- 
cgit v1.2.3


From 138caa4380c442200964c8cf071438a0be89da70 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 13 Apr 2012 00:05:52 +0200
Subject: DBA: Deactivation of the mysqli-class for testing purposes.

---
 include/dba.php | 61 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

(limited to 'include')

diff --git a/include/dba.php b/include/dba.php
index 1421a703d..9031f44cf 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -53,8 +53,9 @@ if(! class_exists('dba')) {
 			}
 
 			if(class_exists('mysqli')) {
-				$this->db = new mysqli($server,$user,$pass,$db);
-				if(NULL === $this->db->connect_error) {
+				$this->db = @new mysqli($server,$user,$pass,$db);
+				//if(NULL === $this->db->connect_error) {
+				if(!$this->db->connect_error) {
 					$this->connected = true;
 				} else {
 					throw new RuntimeException($this->db->connect_error);
@@ -116,7 +117,7 @@ if(! class_exists('dba')) {
 			 // If dbfail.out exists, we will write any failed calls directly to it,
 			 // regardless of any logging that may or may nor be in effect.
 			 // These usually indicate SQL syntax errors that need to be resolved.
-				if(file_exists('dbfail.out')) {
+				if(file_exists('dbfail.out')) {
 					file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
 				}
 				logger('dba: ' . $str );
@@ -176,49 +177,49 @@ if(! class_exists('dba')) {
 		 * commit() or rollback(). Please mind that the db table engine may
 		 * not support this. 
 		 */
-		public function beginTransaction() {
-			if($this->mysqli) {
-				return $this->db->autocommit(false);
-			} else {
+		public function beginTransaction() {
+			if($this->mysqli) {
+				return $this->db->autocommit(false);
+			} else {
 				//no transaction support in mysql module...
-				mysql_query('SET AUTOCOMMIT = 0;', $db); 
-			}
+				mysql_query('SET AUTOCOMMIT = 0;', $db); 
+			}
 		}
 		
 		/**
 		 * rollback a transaction. So, rollback anything that was done since the last call 
 		 * to beginTransaction(). 
 		 */
-		public function rollback() {
-			if($this->mysqli) {
-				return $this->db->rollback();
-			} else {
+		public function rollback() {
+			if($this->mysqli) {
+				return $this->db->rollback();
+			} else {
 				//no transaction support in mysql module...
-				mysql_query('ROLLBACK;', $db);
+				mysql_query('ROLLBACK;', $db);
 			}
-			$this->stopTransaction(); 
+			$this->stopTransaction(); 
 		}
 
 		/**
 		 * commit a transaction. So, write any query to the database. 
 		 */
-		public function commit() {
-			if($this->mysqli) {
-				return $this->db->commit();
-			} else {
-				//no transaction support in mysql module...
-				mysql_query('COMMIT;', $db);
-			}
-			$this->stopTransaction();
+		public function commit() {
+			if($this->mysqli) {
+				return $this->db->commit();
+			} else {
+				//no transaction support in mysql module...
+				mysql_query('COMMIT;', $db);
+			}
+			$this->stopTransaction();
 		}
 		
-		private function stopTransaction() {
-			if($this->mysqli) {
-				return $this->db->autocommit(true);
-			} else {
-				//no transaction support in mysql module...
-				mysql_query('SET AUTOCOMMIT = 1;', $db);
-			}
+		private function stopTransaction() {
+			if($this->mysqli) {
+				return $this->db->autocommit(true);
+			} else {
+				//no transaction support in mysql module...
+				mysql_query('SET AUTOCOMMIT = 1;', $db);
+			}
 		}
 		
 		public function dbg($dbg) {
-- 
cgit v1.2.3


From eb27c32065f64611013cb988ffe28514e14559ac Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 14 Apr 2012 13:17:58 +0200
Subject: DBA: Nothing really done ..

---
 include/dba.php | 71 ---------------------------------------------------------
 1 file changed, 71 deletions(-)
 mode change 100755 => 100644 include/dba.php

(limited to 'include')

diff --git a/include/dba.php b/include/dba.php
old mode 100755
new mode 100644
index 55a4493d1..76cc0bc7b
--- a/include/dba.php
+++ b/include/dba.php
@@ -84,23 +84,9 @@ class dba {
 
 			$mesg = '';
 
-<<<<<<< HEAD:include/dba.php
-			 // If dbfail.out exists, we will write any failed calls directly to it,
-			 // regardless of any logging that may or may nor be in effect.
-			 // These usually indicate SQL syntax errors that need to be resolved.
-				if(file_exists('dbfail.out')) {
-					file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
-				}
-				logger('dba: ' . $str );
-				if(FALSE===$result) {
-					$this->throwOrLog(new RuntimeException('dba: ' . $str));
-					return; 
-				}
-=======
 			if($this->mysqli) {
 				if($this->db->errno)
 					logger('dba: ' . $this->db->error);
->>>>>>> upstream/master:include/dba.php
 			}
 			elseif(mysql_errno($this->db))
 				logger('dba: ' . mysql_error($this->db));
@@ -144,62 +130,6 @@ class dba {
 				$result->free_result();
 			}
 		}
-<<<<<<< HEAD:include/dba.php
-		
-		/**
-		 * starts a transaction. Transactions need to be finished with 
-		 * commit() or rollback(). Please mind that the db table engine may
-		 * not support this. 
-		 */
-		public function beginTransaction() {
-			if($this->mysqli) {
-				return $this->db->autocommit(false);
-			} else {
-				//no transaction support in mysql module...
-				mysql_query('SET AUTOCOMMIT = 0;', $db); 
-			}
-		}
-		
-		/**
-		 * rollback a transaction. So, rollback anything that was done since the last call 
-		 * to beginTransaction(). 
-		 */
-		public function rollback() {
-			if($this->mysqli) {
-				return $this->db->rollback();
-			} else {
-				//no transaction support in mysql module...
-				mysql_query('ROLLBACK;', $db);
-			}
-			$this->stopTransaction(); 
-		}
-
-		/**
-		 * commit a transaction. So, write any query to the database. 
-		 */
-		public function commit() {
-			if($this->mysqli) {
-				return $this->db->commit();
-			} else {
-				//no transaction support in mysql module...
-				mysql_query('COMMIT;', $db);
-			}
-			$this->stopTransaction();
-		}
-		
-		private function stopTransaction() {
-			if($this->mysqli) {
-				return $this->db->autocommit(true);
-			} else {
-				//no transaction support in mysql module...
-				mysql_query('SET AUTOCOMMIT = 1;', $db);
-			}
-		}
-		
-		public function dbg($dbg) {
-			$this->debug = $dbg;
-		}
-=======
 		else {
 			if(mysql_num_rows($result)) {
 				while($x = mysql_fetch_array($result, MYSQL_ASSOC))
@@ -213,7 +143,6 @@ class dba {
 			logger('dba: ' . printable(print_r($r, true)));
 		return($r);
 	}
->>>>>>> upstream/master:include/dba.php
 
 	public function dbg($dbg) {
 		$this->debug = $dbg;
-- 
cgit v1.2.3


From e825a73f1de308b6ae0ae3cc5549263704a14594 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 14 Apr 2012 13:35:11 +0200
Subject: DBA: Reverting back to original source

---
 include/dba.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/dba.php b/include/dba.php
index 76cc0bc7b..44a663eac 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -260,6 +260,4 @@ function dbesc_array(&$arr) {
 	if(is_array($arr) && count($arr)) {
 		array_walk($arr,'dbesc_array_cb');
 	}
-}}		
-
-
+}}
-- 
cgit v1.2.3


From f994f9abc6092106659a29f5ee1be0706825c203 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 15 Apr 2012 06:34:01 -0700
Subject: open contact edit in same window

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

(limited to 'include')

diff --git a/include/Contact.php b/include/Contact.php
index 388819b01..9ba1e8ae5 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -158,7 +158,7 @@ function contact_photo_menu($contact) {
 	$o = "";
 	foreach($menu as $k=>$v){
 		if ($v!="") {
-			if(($k !== t("Network Posts")) && ($k !== t("Send PM")))
+			if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
 				$o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
 			else
 				$o .= "<li><a href=\"$v\">$k</a></li>\n";
-- 
cgit v1.2.3


From c8598e7da629832de3b9f52cc25f33f7f840efb2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 16 Apr 2012 01:35:27 -0700
Subject: edited comments weren't being relayed

---
 include/items.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 85df340d3..c55a55704 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2229,6 +2229,30 @@ function local_delivery($importer,$data) {
 				$datarray = get_atom_elements($feed,$item);
 
 
+				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($item_id),
+					intval($importer['importer_uid'])
+				);
+
+				// Update content if 'updated' changes
+
+				if(count($r)) {
+					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
+							dbesc($datarray['body']),
+							dbesc($datarray['tag']),
+							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+							dbesc($item_id),
+							intval($importer['importer_uid'])
+						);
+					}
+					proc_run('php',"include/notifier.php","comment-import",$r[0]['id']);
+
+					continue;
+				}
+
+
 				// TODO: make this next part work against both delivery threads of a community post
 
 //				if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
-- 
cgit v1.2.3


From 0b838e4cc7031f807808c05b377252b9600840fb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 16 Apr 2012 02:09:00 -0700
Subject: propagate edited comments

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

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index c55a55704..e005ffaef 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2229,7 +2229,7 @@ function local_delivery($importer,$data) {
 				$datarray = get_atom_elements($feed,$item);
 
 
-				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($item_id),
 					intval($importer['importer_uid'])
 				);
@@ -2237,7 +2237,9 @@ function local_delivery($importer,$data) {
 				// Update content if 'updated' changes
 
 				if(count($r)) {
+					$iid = $r[0]['id'];
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+						logger('received updated comment' , LOGGER_DEBUG);
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($datarray['title']),
 							dbesc($datarray['body']),
@@ -2246,8 +2248,10 @@ function local_delivery($importer,$data) {
 							dbesc($item_id),
 							intval($importer['importer_uid'])
 						);
+
+						proc_run('php',"include/notifier.php","comment-import",$iid);
+
 					}
-					proc_run('php',"include/notifier.php","comment-import",$r[0]['id']);
 
 					continue;
 				}
-- 
cgit v1.2.3


From fd2f7dd6ae8871f09674a5325fd4d4ccea56b623 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 16 Apr 2012 03:51:48 -0700
Subject: turn on comment edit

---
 include/conversation.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index f4a564742..e5549a9c1 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -559,10 +559,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					}
 				}
 
-				$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
-						? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"))
-						: False);
-
+				if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+					$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+				else
+					$edpost = false;
 
 				$drop = '';
 				$dropping = false;
-- 
cgit v1.2.3