Merge pull request #927 from annando/master

Massive SQL stuff

boot.php

@@ -14,7 +14,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.2.1748' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1169      );
+define ( 'DB_UPDATE_VERSION',      1170      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -739,7 +739,7 @@ if(! class_exists('App')) {
 			if($this->cached_profile_picdate[$common_filename]){
 				$this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
 			} else {
-				$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like \"%%/%s\"",
+				$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
 					$common_filename);
 				if(! count($r)){
 					$this->cached_profile_image[$avatar_image] = $avatar_image;
@@ -1328,7 +1328,7 @@ if(! function_exists('profile_load')) {
 		if($profile) {
 			$profile_int = intval($profile);
 			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
-					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 					WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
 					dbesc($nickname),
 					intval($profile_int)
@@ -1336,7 +1336,7 @@ if(! function_exists('profile_load')) {
 		}
 		if((! $r) && (!  count($r))) {
 			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
-					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 					WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
 					dbesc($nickname)
 			);
@@ -1591,7 +1591,7 @@ if(! function_exists('get_birthdays')) {
 		$bd_short = t('F d');
 
 		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
-				LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
+				INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
 				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
 				ORDER BY `start` ASC ",
 				intval(local_user()),

database.sql

@@ -1192,3 +1192,44 @@ CREATE TABLE IF NOT EXISTS `unique_contacts` (
   PRIMARY KEY (`id`),
   KEY `url` (`url`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `thread`
+--
+
+CREATE TABLE IF NOT EXISTS `thread` (
+  `iid` int(10) unsigned NOT NULL DEFAULT '0',
+  `uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `contact-id` int(11) unsigned NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `wall` tinyint(1) NOT NULL DEFAULT '0',
+  `private` tinyint(1) NOT NULL DEFAULT '0',
+  `pubmail` tinyint(1) NOT NULL DEFAULT '0',
+  `moderated` tinyint(1) NOT NULL DEFAULT '0',
+  `visible` tinyint(1) NOT NULL DEFAULT '0',
+  `spam` tinyint(1) NOT NULL DEFAULT '0',
+  `starred` tinyint(1) NOT NULL DEFAULT '0',
+  `bookmark` tinyint(1) NOT NULL DEFAULT '0',
+  `unseen` tinyint(1) NOT NULL DEFAULT '1',
+  `deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `origin` tinyint(1) NOT NULL DEFAULT '0',
+  `forum_mode` tinyint(1) NOT NULL DEFAULT '0',
+  `mention` tinyint(1) NOT NULL DEFAULT '0',
+  `network` char(32) NOT NULL,
+  PRIMARY KEY (`iid`),
+  KEY `created` (`created`),
+  KEY `commented` (`commented`),
+  KEY `uid_network_commented` (`uid`,`network`,`commented`),
+  KEY `uid_network_created` (`uid`,`network`,`created`),
+  KEY `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
+  KEY `uid_contactid_created` (`uid`,`contact-id`,`created`),
+  KEY `wall_private_received` (`wall`,`private`,`received`),
+  KEY `uid_created` (`uid`,`created`),
+  KEY `uid_commented` (`uid`,`commented`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

include/Contact.php

@@ -64,13 +64,13 @@ function contact_remove($id) {
 
 	$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
 	if($archive) {
-		q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1",
+		q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d",
 			intval($id)
 		);
 		return;
 	}
 
-	q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+	q("DELETE FROM `contact` WHERE `id` = %d",
 		intval($id)
 	);
 	q("DELETE FROM `item` WHERE `contact-id` = %d ",
@@ -148,7 +148,7 @@ function mark_for_death($contact) {
 		return;
 
 	if($contact['term-date'] == '0000-00-00 00:00:00') {
-		q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
+		q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
 				dbesc(datetime_convert()),
 				intval($contact['id'])
 		);
@@ -166,7 +166,7 @@ function mark_for_death($contact) {
 			// archive them rather than delete
 			// though if the owner tries to unarchive them we'll start the whole process over again
 
-			q("update contact set `archive` = 1 where id = %d limit 1",
+			q("update contact set `archive` = 1 where id = %d",
 				intval($contact['id'])
 			);
 			q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
@@ -181,7 +181,7 @@ function mark_for_death($contact) {
 if(! function_exists('unmark_for_death')) {
 function unmark_for_death($contact) {
 	// It's a miracle. Our dead contact has inexplicably come back to life.
-	q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
+	q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
 		dbesc('0000-00-00 00:00:00'),
 		intval($contact['id'])
 	);

include/Photo.php

@@ -595,7 +595,7 @@ class Photo {
                 `allow_gid` = '%s',
                 `deny_cid` = '%s',
                 `deny_gid` = '%s'
-                where id = %d limit 1",
+                where id = %d",
 
                 intval($uid),
                 intval($cid),

include/acl_selectors.php

@@ -399,19 +399,19 @@ function acl_lookup(&$a, $out_type = 'json') {
 	} else {
 		$sql_extra = $sql_extra2 = "";
 	}
-	
+
 	// count groups and contacts
 	if ($type=='' || $type=='g'){
-		$r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
+		$r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
 			intval(local_user())
 		);
 		$group_count = (int)$r[0]['g'];
 	} else {
 		$group_count = 0;
 	}
-	
+
 	if ($type=='' || $type=='c'){
-		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+		$r = q("SELECT COUNT(*) AS c FROM `contact` 
 				WHERE `uid` = %d AND `self` = 0 
 				AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
 				AND `notify` != '' $sql_extra2" ,
@@ -423,7 +423,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 
 		// autocomplete for Private Messages
 
-		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+		$r = q("SELECT COUNT(*) AS c FROM `contact` 
 				WHERE `uid` = %d AND `self` = 0 
 				AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 
 				AND `network` IN ('%s','%s','%s') $sql_extra2" ,
@@ -439,7 +439,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 
 		// autocomplete for Contacts
 
-		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+		$r = q("SELECT COUNT(*) AS c FROM `contact` 
 				WHERE `uid` = %d AND `self` = 0 
 				AND `pending` = 0 $sql_extra2" ,
 			intval(local_user())

include/api.php

@@ -384,26 +384,26 @@
 				intval(api_user())
 			);
 
+			//AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
 			// count public wall messages
-			$r = q("SELECT COUNT(`id`) as `count` FROM `item`
+			$r = q("SELECT count(*) as `count` FROM `item`
 					WHERE  `uid` = %d
-					AND `type`='wall'
-					AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+					AND `type`='wall'",
 					intval($uinfo[0]['uid'])
 			);
 			$countitms = $r[0]['count'];
 		}
 		else {
-			$r = q("SELECT COUNT(`id`) as `count` FROM `item`
-					WHERE  `contact-id` = %d
-					AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+			//AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+			$r = q("SELECT count(*) as `count` FROM `item`
+					WHERE  `contact-id` = %d",
 					intval($uinfo[0]['id'])
 			);
 			$countitms = $r[0]['count'];
 		}
 
 		// count friends
-		$r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+		$r = q("SELECT count(*) as `count` FROM `contact`
 				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
 				AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
 				intval($uinfo[0]['uid']),
@@ -412,7 +412,7 @@
 		);
 		$countfriends = $r[0]['count'];
 
-		$r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+		$r = q("SELECT count(*) as `count` FROM `contact`
 				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
 				AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
 				intval($uinfo[0]['uid']),
@@ -421,7 +421,7 @@
 		);
 		$countfollowers = $r[0]['count'];
 
-		$r = q("SELECT count(`id`) as `count` FROM item where starred = 1 and uid = %d and deleted = 0",
+		$r = q("SELECT count(*) as `count` FROM item where starred = 1 and uid = %d and deleted = 0",
 			intval($uinfo[0]['uid'])
 		);
 		$starred = $r[0]['count'];
@@ -528,7 +528,8 @@
 		$status_user["protected"] = (($item["allow_cid"] != "") OR
 						($item["allow_gid"] != "") OR
 						($item["deny_cid"] != "") OR
-						($item["deny_gid"] != ""));
+						($item["deny_gid"] != "") OR
+						$item["private"]);
 
 		return ($status_user);
 	}
@@ -745,12 +746,27 @@
 		logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
 
 		// get last public wall message
-		$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `c`.`nick` as `reply_author`, `i`.`author-link` AS `item-author`
-				FROM `item`, `contact`, `item` as `i`, `contact` as `c`
+		//$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `c`.`nick` as `reply_author`, `i`.`author-link` AS `item-author`
+		//		FROM `item`, `contact`, `item` as `i`, `contact` as `c`
+		//		WHERE `item`.`contact-id` = %d
+		//			AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
+		//			AND `i`.`id` = `item`.`parent`
+		//			AND `contact`.`id`=`item`.`contact-id` AND `c`.`id`=`i`.`contact-id` AND `contact`.`self`=1
+		//			AND `item`.`type`!='activity'
+		//			AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+		//		ORDER BY `item`.`created` DESC
+		//		LIMIT 1",
+		//		intval($user_info['cid']),
+		//		dbesc($user_info['url']),
+		//		dbesc(normalise_link($user_info['url'])),
+		//		dbesc($user_info['url']),
+		//		dbesc(normalise_link($user_info['url']))
+		//);
+		$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`author-link` AS `item-author`
+				FROM `item`, `item` as `i`
 				WHERE `item`.`contact-id` = %d
 					AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
 					AND `i`.`id` = `item`.`parent`
-					AND `contact`.`id`=`item`.`contact-id` AND `c`.`id`=`i`.`contact-id` AND `contact`.`self`=1
 					AND `item`.`type`!='activity'
 					AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
 				ORDER BY `item`.`created` DESC
@@ -773,8 +789,6 @@
 			if ($lastwall['parent']!=$lastwall['id']) {
 				$in_reply_to_status_id= intval($lastwall['parent']);
 				$in_reply_to_status_id_str = (string) intval($lastwall['parent']);
-				//$in_reply_to_user_id = $lastwall['reply_uid'];
-				//$in_reply_to_screen_name = $lastwall['reply_author'];
 
 				$r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($lastwall['item-author'])));
 				if ($r) {
@@ -807,6 +821,9 @@
 				'statusnet_conversation_id'	=> $lastwall['parent'],
 			);
 
+			if ($lastwall['title'] != "")
+				$status_info['statusnet_html'] = "<h4>".bbcode($lastwall['title'])."</h4>\n".$status_info['statusnet_html'];
+
 			$entities = api_get_entitities($status_info['text'], $lastwall['body']);
 			if (count($entities) > 0)
 				$status_info['entities'] = $entities;
@@ -842,13 +859,14 @@
 
 		$lastwall = q("SELECT `item`.*
 				FROM `item`, `contact`
-				WHERE `item`.`contact-id` = %d
+				WHERE `item`.`uid` = %d AND `item`.`contact-id` = %d
 					AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
 					AND `contact`.`id`=`item`.`contact-id`
 					AND `type`!='activity'
 					AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
 				ORDER BY `created` DESC
 				LIMIT 1",
+				intval(api_user()),
 				intval($user_info['cid']),
 				dbesc($user_info['url']),
 				dbesc(normalise_link($user_info['url'])),
@@ -900,6 +918,9 @@
 				'statusnet_conversation_id'	=> $lastwall['parent'],
 			);
 
+			if ($lastwall['title'] != "")
+				$user_info['statusnet_html'] = "<h4>".bbcode($lastwall['title'])."</h4>\n".$user_info['statusnet_html'];
+
 			$entities = api_get_entitities($user_info['text'], $lastwall['body']);
 			if (count($entities) > 0)
 				$user_info['entities'] = $entities;
@@ -1041,8 +1062,8 @@
         	        `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`
+                	FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                	INNER 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`  = ''
@@ -1827,6 +1848,9 @@
 				'statusnet_conversation_id'	=> $item['parent'],
 			);
 
+			if ($item['title'] != "")
+				$status['statusnet_html'] = "<h4>".bbcode($item['title'])."</h4>\n".$status['statusnet_html'];
+
 			$entities = api_get_entitities($status['text'], $item['body']);
 			if (count($entities) > 0)
 				$status['entities'] = $entities;

include/bbcode.php

@@ -2,6 +2,35 @@
 require_once("include/oembed.php");
 require_once('include/event.php');
 
+function bb_rearrange_link($shared) {
+	if ($shared[1] != "type-link")
+		return($shared[0]);
+
+	$newshare = trim($shared[2]);
+	$newshare = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $newshare);
+
+	if (!strpos($shared[0], "[bookmark"))
+		$newshare = preg_replace("/\[url\=(.*?)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $newshare, 1);
+
+	preg_match("/\[img\](.*?)\[\/img\]/ism", $newshare, $matches);
+
+	if ($matches) {
+		$newshare = str_replace($matches[0], '', $newshare);
+		$newshare = "[img]".$matches[1]."[/img]\n".$newshare;
+	}
+
+	$search = array("\n\n", "\n ", " \n");
+	$replace = array("\n", "\n", "\n");
+	do {
+		$oldtext = $newshare;
+		$newshare = str_replace($search, $replace, $newshare);
+	} while ($oldtext != $newshare);
+
+	$newshare = "[class=type-link]".$newshare."[/class]";
+
+	return($newshare);
+}
+
 function bb_remove_share_information($Text) {
         $Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanup_share",$Text);
         return($Text);
@@ -670,6 +699,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	$Text = preg_replace("/\n\[code\]/ism", "[code]", $Text);
 	$Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text);
 
+	// Rearrange shared links
+	if (get_config("system", "rearrange_shared_links") AND (!$simplehtml OR $tryoembed))
+		$Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_rearrange_link",$Text);
+
 	// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
 	if (!$tryoembed)
 		$Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);

include/cache.php

@@ -47,7 +47,7 @@
  *				dbesc($key)
  *			);
  *			if(count($r)) {
- *				q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1",
+ *				q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s'",
  *					dbesc($value),
  *					dbesc(datetime_convert()),
  *					dbesc($key));

include/config.php

@@ -66,12 +66,22 @@ function get_config($family, $key, $instore = false) {
 		}
 	}
 
-	// If APC is enabled then fetch the data from there
+	// If APC is enabled then fetch the data from there, else try XCache
 	if (function_exists("apc_fetch") AND function_exists("apc_exists"))
 		if (apc_exists($family."|".$key)) {
 			$val = apc_fetch($family."|".$key);
 			$a->config[$family][$key] = $val;
 
+			if ($val === '!<unset>!')
+				return false;
+			else
+				return $val;
+		}
+	elseif (function_exists("xcache_fetch") AND function_exists("xcache_isset"))
+		if (xcache_isset($family."|".$key)) {
+			$val = xcache_fetch($family."|".$key);
+			$a->config[$family][$key] = $val;
+
 			if ($val === '!<unset>!')
 				return false;
 			else
@@ -87,18 +97,22 @@ function get_config($family, $key, $instore = false) {
 		$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 		$a->config[$family][$key] = $val;
 
-		// If APC is enabled then store the data there
+		// If APC is enabled then store the data there, else try XCache
 		if (function_exists("apc_store"))
 			apc_store($family."|".$key, $val, 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($family."|".$key, $val, 600);
 
 		return $val;
 	}
 	else {
 		$a->config[$family][$key] = '!<unset>!';
 
-		// If APC is enabled then store the data there
+		// If APC is enabled then store the data there, else try XCache
 		if (function_exists("apc_store"))
 			apc_store($family."|".$key, '!<unset>!', 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($family."|".$key, '!<unset>!', 600);
 	}
 	return false;
 }}
@@ -134,7 +148,7 @@ function set_config($family,$key,$value) {
 		return $ret;
 	}
 
-	$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s'",
 		dbesc($dbvalue),
 		dbesc($family),
 		dbesc($key)
@@ -142,9 +156,11 @@ function set_config($family,$key,$value) {
 
 	$a->config[$family][$key] = $value;
 
-	// If APC is enabled then store the data there
+	// If APC is enabled then store the data there, else try XCache
 	if (function_exists("apc_store"))
 		apc_store($family."|".$key, $value, 600);
+	elseif (function_exists("xcache_set"))
+		xcache_set($family."|".$key, $value, 600);
 
 	if($ret)
 		return $value;
@@ -193,7 +209,7 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 		}
 	}
 
-	// If APC is enabled then fetch the data from there
+	// If APC is enabled then fetch the data from there, else try XCache
 	if (function_exists("apc_fetch") AND function_exists("apc_exists"))
 		if (apc_exists($uid."|".$family."|".$key)) {
 			$val = apc_fetch($uid."|".$family."|".$key);
@@ -204,6 +220,16 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 			else
 				return $val;
 		}
+	elseif (function_exists("xcache_get") AND function_exists("xcache_isset"))
+		if (xcache_isset($uid."|".$family."|".$key)) {
+			$val = xcache_get($uid."|".$family."|".$key);
+			$a->config[$uid][$family][$key] = $val;
+
+			if ($val === '!<unset>!')
+				return false;
+			else
+				return $val;
+		}
 
 
 	$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
@@ -216,18 +242,22 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 		$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 		$a->config[$uid][$family][$key] = $val;
 
-		// If APC is enabled then store the data there
+		// If APC is enabled then store the data there, else try XCache
 		if (function_exists("apc_store"))
 			apc_store($uid."|".$family."|".$key, $val, 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($uid."|".$family."|".$key, $val, 600);
 
 		return $val;
 	}
 	else {
 		$a->config[$uid][$family][$key] = '!<unset>!';
 
-		// If APC is enabled then store the data there
+		// If APC is enabled then store the data there, else try XCache
 		if (function_exists("apc_store"))
 			apc_store($uid."|".$family."|".$key, '!<unset>!', 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($uid."|".$family."|".$key, '!<unset>!', 600);
 	}
 	return false;
 }}
@@ -238,13 +268,15 @@ function del_config($family,$key) {
 	global $a;
 	if(x($a->config[$family],$key))
 		unset($a->config[$family][$key]);
-	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s'",
 		dbesc($family),
 		dbesc($key)
 	);
-	// If APC is enabled then store the data there
+	// If APC is enabled then delete the data from there, else try XCache
 	if (function_exists("apc_delete"))
 		apc_delete($family."|".$key);
+	elseif (function_exists("xcache_unset"))
+		xcache_unset($family."|".$key);
 
 	return $ret;
 }}
@@ -274,7 +306,7 @@ function set_pconfig($uid,$family,$key,$value) {
 			return $value;
 		return $ret;
 	}
-	$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
 		dbesc($dbvalue),
 		intval($uid),
 		dbesc($family),
@@ -283,9 +315,11 @@ function set_pconfig($uid,$family,$key,$value) {
 
 	$a->config[$uid][$family][$key] = $value;
 
-	// If APC is enabled then store the data there
+	// If APC is enabled then store the data there, else try XCache
 	if (function_exists("apc_store"))
 		apc_store($uid."|".$family."|".$key, $value, 600);
+	elseif (function_exists("xcache_set"))
+		xcache_set($uid."|".$family."|".$key, $value, 600);
 
 
 	if($ret)
@@ -299,7 +333,7 @@ function del_pconfig($uid,$family,$key) {
 	global $a;
 	if(x($a->config[$uid][$family],$key))
 		unset($a->config[$uid][$family][$key]);
-	$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
 		intval($uid),
 		dbesc($family),
 		dbesc($key)

include/datetime.php

@@ -19,7 +19,7 @@ if(! function_exists('select_timezone')) {
 function select_timezone($current = 'America/Los_Angeles') {
 
 	$timezone_identifiers = DateTimeZone::listIdentifiers();
-	
+
 	$o ='<select id="timezone_select" name="timezone">';
 
 	usort($timezone_identifiers, 'timezone_cmp');
@@ -487,11 +487,11 @@ function update_contact_birthdays() {
 				dbesc('birthday'),
 				intval(0)
 			);
-			
+
 
 			// update bdyear
 
-			q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d",
 				dbesc(substr($nextbd,0,4)),
 				dbesc($nextbd),
 				intval($rr['uid']),

include/dba.php

@@ -18,6 +18,7 @@ class dba {
 
 	private $debug = 0;
 	private $db;
+	private $result;
 	public  $mysqli = true;
 	public  $connected = false;
 	public  $error = false;
@@ -75,7 +76,7 @@ class dba {
 		return $this->db;
 	}
 
-	public function q($sql) {
+	public function q($sql, $onlyquery = false) {
 		global $a;
 
 		if((! $this->db) || (! $this->connected))
@@ -154,6 +155,11 @@ class dba {
 		if(($result === true) || ($result === false))
 			return $result;
 
+		if ($onlyquery) {
+			$this->result = $result;
+			return true;
+		}
+
 		$r = array();
 		if($this->mysqli) {
 			if($result->num_rows) {
@@ -177,6 +183,30 @@ class dba {
 		return($r);
 	}
 
+	public function qfetch() {
+		$x = false;
+
+		if ($this->result)
+			if($this->mysqli) {
+				if($this->result->num_rows)
+					$x = $this->result->fetch_array(MYSQLI_ASSOC);
+			} else {
+				if(mysql_num_rows($this->result))
+					$x = mysql_fetch_array($this->result, MYSQL_ASSOC);
+			}
+
+		return($x);
+	}
+
+	public function qclose() {
+		if ($this->result)
+			if($this->mysqli) {
+				$this->result->free_result();
+			} else {
+				mysql_free_result($this->result);
+			}
+	}
+
 	public function dbg($dbg) {
 		$this->debug = $dbg;
 	}

include/delivery.php

@@ -157,7 +157,7 @@ function delivery_run(&$argv, &$argc){
 		$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, 
 			`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, 
 			`user`.`page-flags`, `user`.`prvnets`
-			FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 			WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 			intval($uid)
 		);
@@ -319,7 +319,7 @@ function delivery_run(&$argv, &$argc){
 						`contact`.`name` as `senderName`,
 						`user`.* 
 						FROM `contact` 
-						LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+						INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` 
 						WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 						AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
 						$sql_extra
@@ -366,7 +366,6 @@ function delivery_run(&$argv, &$argc){
 				break;
 
 			case NETWORK_OSTATUS :
-
 				// Do not send to otatus if we are not configured to send to public networks
 				if($owner['prvnets'])
 					break;
@@ -386,7 +385,7 @@ function delivery_run(&$argv, &$argc){
 						// private emails may be in included in public conversations. Filter them.
 						if(($public_message) && $item['private'] == 1)
 							continue;
-	
+
 						$item_contact = get_item_contact($item,$icontacts);
 						if(! $item_contact)
 							continue;

include/diaspora.php

@@ -7,6 +7,46 @@ require_once('include/contact_selectors.php');
 require_once('include/queue_fn.php');
 require_once('include/lock.php');
 
+function diaspora_add_page_info($url) {
+	require_once("mod/parse_url.php");
+	$data = parseurl_getsiteinfo($url, true);
+
+	logger('diaspora_add_page_info: fetch page info for '.$url.' '.print_r($data, true), LOGGER_DATA);
+
+	if (($data["type"] != "link") OR ($data["title"] == $url))
+		return("");
+
+	if (is_string($data["title"]))
+		$text .= "[bookmark=".$url."]".trim($data["title"])."[/bookmark]";
+
+	if (sizeof($data["images"]) > 0) {
+		$imagedata = $data["images"][0];
+		$text .= '[img]'.$imagedata["src"].'[/img]';
+	}
+
+	if (is_string($data["text"]))
+		$text .= "[quote]".$data["text"]."[/quote]";
+
+	return("\n[class=type-".$data["type"]."]".$text."[/class]");
+}
+
+function diaspora_add_page_info_to_body($body) {
+
+	logger('diaspora_add_page_info_to_body: fetch page info for body '.$body, LOGGER_DATA);
+
+	$URLSearchString = "^\[\]";
+
+	// Adding these spaces is a quick hack due to my problems with regular expressions :)
+	preg_match("/[^@#]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches);
+
+	if (!$matches)
+		preg_match("/[^@#]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches);
+
+	if ($matches)
+		$body .= diaspora_add_page_info($matches[1]);
+
+	return $body;
+}
 
 function diaspora_dispatch_public($msg) {
 
@@ -578,7 +618,7 @@ function diaspora_request($importer,$xml) {
 		// That makes us friends.
 
 		if($contact['rel'] == CONTACT_IS_FOLLOWER && $importer['page-flags'] != PAGE_COMMUNITY) {
-			q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
 				intval(CONTACT_IS_FRIEND),
 				intval($contact['id']),
 				intval($importer['uid'])
@@ -733,7 +773,7 @@ function diaspora_request($importer,$xml) {
 			`avatar-date` = '%s', 
 			`blocked` = 0, 
 			`pending` = 0
-			WHERE `id` = %d LIMIT 1
+			WHERE `id` = %d
 			",
 			dbesc($photos[0]),
 			dbesc($photos[1]),
@@ -759,7 +799,7 @@ function diaspora_post_allow($importer,$contact) {
 	// That makes us friends.
 	// Normally this should have handled by getting a request - but this could get lost
 	if($contact['rel'] == CONTACT_IS_FOLLOWER && $importer['page-flags'] != PAGE_COMMUNITY) {
-		q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
 			intval(CONTACT_IS_FRIEND),
 			intval($contact['id']),
 			intval($importer['uid'])
@@ -827,6 +867,9 @@ function diaspora_post($importer,$xml,$msg) {
 
 	$body = diaspora2bb($xml->raw_message);
 
+	// Add OEmbed and other information to the body
+	$body = diaspora_add_page_info_to_body($body);
+
 	$datarray = array();
 
 	$str_tags = '';
@@ -873,7 +916,7 @@ function diaspora_post($importer,$xml,$msg) {
 	$datarray['network']  = NETWORK_DIASPORA;
 	$datarray['guid'] = $guid;
 	$datarray['uri'] = $datarray['parent-uri'] = $message_id;
-	$datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
+	$datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
 	$datarray['private'] = $private;
 	$datarray['parent'] = 0;
 	$datarray['plink'] = $plink;
@@ -895,7 +938,7 @@ function diaspora_post($importer,$xml,$msg) {
 	$message_id = item_store($datarray);
 
 	//if($message_id) {
-	//	q("update item set plink = '%s' where id = %d limit 1",
+	//	q("update item set plink = '%s' where id = %d",
 	//		dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
 	//		intval($message_id)
 	//	);
@@ -966,18 +1009,36 @@ function diaspora_reshare($importer,$xml,$msg) {
 	}
 	elseif($source_xml->post->status_message) {
 		$body = diaspora2bb($source_xml->post->status_message->raw_message);
+
+		// Checking for embedded pictures
+		if($source_xml->post->status_message->photo->remote_photo_path AND
+			$source_xml->post->status_message->photo->remote_photo_name) {
+
+			$remote_photo_path = notags(unxmlify($source_xml->post->status_message->photo->remote_photo_path));
+			$remote_photo_name = notags(unxmlify($source_xml->post->status_message->photo->remote_photo_name));
+
+			$body = '[img]'.$remote_photo_path.$remote_photo_name.'[/img]'."\n".$body;
+
+			logger('diaspora_reshare: embedded picture link found: '.$body, LOGGER_DEBUG);
+		}
+
 		$body = scale_external_images($body);
 
+		// Add OEmbed and other information to the body
+		$body = diaspora_add_page_info_to_body($body);
 	}
 	else {
+		// Maybe it is a reshare of a photo that will be delivered at a later time (testing)
 		logger('diaspora_reshare: no reshare content found: ' . print_r($source_xml,true));
-		return;
-	}
-	if(! $body) {
-		logger('diaspora_reshare: empty body: source= ' . $x);
-		return;
+		$body = "";
+		//return;
 	}
 
+	//if(! $body) {
+	//	logger('diaspora_reshare: empty body: source= ' . $x);
+	//	return;
+	//}
+
 	$person = find_diaspora_person_by_handle($orig_author);
 
 	/*if(is_array($person) && x($person,'name') && x($person,'url'))
@@ -1041,7 +1102,7 @@ function diaspora_reshare($importer,$xml,$msg) {
 	$datarray['network']  = NETWORK_DIASPORA;
 	$datarray['guid'] = $guid;
 	$datarray['uri'] = $datarray['parent-uri'] = $message_id;
-	$datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
+	$datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
 	$datarray['private'] = $private;
 	$datarray['parent'] = 0;
 	$datarray['plink'] = $plink;
@@ -1068,10 +1129,13 @@ function diaspora_reshare($importer,$xml,$msg) {
 	$datarray['tag'] = $str_tags;
 	$datarray['app']  = 'Diaspora';
 
+	// if empty content it might be a photo that hasn't arrived yet. If a photo arrives, we'll make it visible. (testing)
+	$datarray['visible'] = ((strlen($body)) ? 1 : 0);
+
 	$message_id = item_store($datarray);
 
 	//if($message_id) {
-	//	q("update item set plink = '%s' where id = %d limit 1",
+	//	q("update item set plink = '%s' where id = %d",
 	//		dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
 	//		intval($message_id)
 	//	);
@@ -1152,7 +1216,7 @@ function diaspora_asphoto($importer,$xml,$msg) {
 	$datarray['network']  = NETWORK_DIASPORA;
 	$datarray['guid'] = $guid;
 	$datarray['uri'] = $datarray['parent-uri'] = $message_id;
-	$datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
+	$datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
 	$datarray['private'] = $private;
 	$datarray['parent'] = 0;
 	$datarray['plink'] = $plink;
@@ -1170,7 +1234,7 @@ function diaspora_asphoto($importer,$xml,$msg) {
 	$message_id = item_store($datarray);
 
 	//if($message_id) {
-	//	q("update item set plink = '%s' where id = %d limit 1",
+	//	q("update item set plink = '%s' where id = %d",
 	//		dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
 	//		intval($message_id)
 	//	);
@@ -1277,7 +1341,7 @@ function diaspora_comment($importer,$xml,$msg) {
 	if(strcasecmp($diaspora_handle,$msg['author']) == 0)
 		$person = $contact;
 	else {
-		$person = find_diaspora_person_by_handle($diaspora_handle);	
+		$person = find_diaspora_person_by_handle($diaspora_handle);
 
 		if(! is_array($person)) {
 			logger('diaspora_comment: unable to find author details');
@@ -1286,7 +1350,6 @@ function diaspora_comment($importer,$xml,$msg) {
 	}
 
 	$body = diaspora2bb($text);
-
 	$message_id = $diaspora_handle . ':' . $guid;
 
 	$datarray = array();
@@ -1330,7 +1393,7 @@ function diaspora_comment($importer,$xml,$msg) {
 	$datarray['parent-uri'] = $parent_item['uri'];
 
 	// No timestamps for comments? OK, we'll the use current time.
-	$datarray['created'] = $datarray['edited'] = datetime_convert();
+	$datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert();
 	$datarray['private'] = $parent_item['private'];
 
 	$datarray['owner-name'] = $parent_item['owner-name'];
@@ -1350,7 +1413,7 @@ function diaspora_comment($importer,$xml,$msg) {
 	$message_id = item_store($datarray);
 
 	if($message_id) {
-		q("update item set plink = '%s' where id = %d limit 1",
+		q("update item set plink = '%s' where id = %d",
 			dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
 			intval($message_id)
 		);
@@ -1559,15 +1622,15 @@ function diaspora_conversation($importer,$xml,$msg) {
 			dbesc($message_id),
 			dbesc($parent_uri),
 			dbesc($msg_created_at)
-		);			
+		);
 
-		q("update conv set updated = '%s' where id = %d limit 1",
+		q("update conv set updated = '%s' where id = %d",
 			dbesc(datetime_convert()),
 			intval($conversation['id'])
-		);		
+		);
 
 		require_once('include/enotify.php');
-		notification(array(			
+		notification(array(
 			'type' => NOTIFY_MAIL,
 			'notify_flags' => $importer['notify-flags'],
 			'language' => $importer['language'],
@@ -1626,7 +1689,7 @@ function diaspora_message($importer,$xml,$msg) {
 	}
 
 	$reply = 0;
-			
+
 	$body = diaspora2bb($msg_text);
 	$message_id = $msg_diaspora_handle . ':' . $msg_guid;
 
@@ -1672,13 +1735,13 @@ function diaspora_message($importer,$xml,$msg) {
 		dbesc($message_id),
 		dbesc($parent_uri),
 		dbesc($msg_created_at)
-	);			
+	);
 
-	q("update conv set updated = '%s' where id = %d limit 1",
+	q("update conv set updated = '%s' where id = %d",
 		dbesc(datetime_convert()),
 		intval($conversation['id'])
-	);		
-	
+	);
+
 	return;
 }
 
@@ -1740,7 +1803,7 @@ function diaspora_photo($importer,$xml,$msg,$attempt=1) {
 	                                   array($remote_photo_name, 'scaled_full_' . $remote_photo_name));
 
 	if(strpos($parent_item['body'],$link_text) === false) {
-		$r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d limit 1",
+		$r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d",
 			dbesc($link_text . $parent_item['body']),
 			intval($parent_item['id']),
 			intval($parent_item['uid'])
@@ -1800,12 +1863,12 @@ function diaspora_like($importer,$xml,$msg) {
 		if($positive === 'true') {
 			logger('diaspora_like: duplicate like: ' . $guid);
 			return;
-		} 
+		}
 		// Note: I don't think "Like" objects with positive = "false" are ever actually used
 		// It looks like "RelayableRetractions" are used for "unlike" instead
 		if($positive === 'false') {
 			logger('diaspora_like: received a like with positive set to "false"...ignoring');
-/*			q("UPDATE `item` SET `deleted` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+/*			q("UPDATE `item` SET `deleted` = 1 WHERE `id` = %d AND `uid` = %d",
 				intval($r[0]['id']),
 				intval($importer['uid'])
 			);*/
@@ -1942,7 +2005,7 @@ EOT;
 
 
 	if($message_id) {
-		q("update item set plink = '%s' where id = %d limit 1",
+		q("update item set plink = '%s' where id = %d",
 			dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
 			intval($message_id)
 		);
@@ -1989,8 +2052,8 @@ function diaspora_retraction($importer,$xml) {
 		);
 		if(count($r)) {
 			if(link_compare($r[0]['author-link'],$contact['url'])) {
-				q("update item set `deleted` = 1, `changed` = '%s' where `id` = %d limit 1",
-					dbesc(datetime_convert()),			
+				q("update item set `deleted` = 1, `changed` = '%s' where `id` = %d",
+					dbesc(datetime_convert()),
 					intval($r[0]['id'])
 				);
 			}
@@ -2060,12 +2123,12 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
 		);
 		if(count($r)) {
 			if(link_compare($r[0]['author-link'],$contact['url'])) {
-				q("update item set `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' where `id` = %d limit 1",
-					dbesc(datetime_convert()),			
-					dbesc(datetime_convert()),			
+				q("update item set `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' where `id` = %d",
+					dbesc(datetime_convert()),
+					dbesc(datetime_convert()),
 					intval($r[0]['id'])
 				);
-	
+
 				// Now check if the retraction needs to be relayed by us
 				//
 				// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
@@ -2161,7 +2224,7 @@ function diaspora_profile($importer,$xml,$msg) {
 	// TODO: update name on item['author-name'] if the name changed. See consume_feed()
 	// Not doing this currently because D* protocol is scheduled for revision soon. 
 
-	$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+	$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s' WHERE `id` = %d AND `uid` = %d",
 		dbesc($name),
 		dbesc(datetime_convert()),
 		dbesc($images[0]),
@@ -2331,7 +2394,7 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals
 		if(! count($r))
 			continue;
 		$public = (($r[0]['allow_cid'] || $r[0]['allow_gid'] || $r[0]['deny_cid'] || $r[0]['deny_gid']) ? 'false' : 'true' );
-		$msg = replace_macros($tpl,array(		
+		$msg = replace_macros($tpl,array(
 			'$path' => xmlify($image['path']),
 			'$filename' => xmlify($image['file']),
 			'$msg_guid' => xmlify($image['guid']),

include/dsprphotoq.php

@@ -8,7 +8,7 @@ function dsprphotoq_run($argv, $argc){
 	if(is_null($a)){
 		$a = new App;
 	}
-  
+
 	if(is_null($db)){
 		@include(".htconfig.php");
 		require_once("include/dba.php");

include/enotify.php

@@ -255,10 +255,10 @@ function notification($params) {
 	$sitelink  = $h['sitelink'];
 	$tsitelink = $h['tsitelink'];
 	$hsitelink = $h['hsitelink'];
-	$itemlink  = $h['itemlink']; 
+	$itemlink  = $h['itemlink'];
 
 
-	require_once('include/html2bbcode.php');	
+	require_once('include/html2bbcode.php');
 
 	do {
 		$dups = false;
@@ -331,7 +331,7 @@ function notification($params) {
 	);
 	if($p && (count($p) > 1)) {
 		for ($d = 1; $d < count($p); $d ++) {
-			q("delete from notify where id = %d limit 1",
+			q("delete from notify where id = %d",
 				intval($p[$d]['id'])
 			);
 		}
@@ -353,12 +353,12 @@ function notification($params) {
 
 	$itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id;
 	$msg = replace_macros($epreamble,array('$itemlink' => $itemlink));
-	$r = q("update notify set msg = '%s' where id = %d and uid = %d limit 1",
+	$r = q("update notify set msg = '%s' where id = %d and uid = %d",
 		dbesc($msg),
 		intval($notify_id),
 		intval($params['uid'])
 	);
-		
+
 
 	// send email notification if notification preferences permit
 
@@ -370,15 +370,15 @@ function notification($params) {
 		$id_for_parent = "${params['parent']}@${hostname}";
 
 		// Is this the first email notification for this parent item and user?
-		
-		$r = q("select `id` from `notify-threads` where `master-parent-item` = %d and `receiver-uid` = %d limit 1", 
+
+		$r = q("select `id` from `notify-threads` where `master-parent-item` = %d and `receiver-uid` = %d limit 1",
 			intval($params['parent']),
 			intval($params['uid']) );
 
 		// If so, create the record of it and use a message-id smtp header.
 
 		if(!$r) {
-			logger("notify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " . 
+			logger("notify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " .
 intval($params['uid']), LOGGER_DEBUG);
 			$r = q("insert into `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
 				values(%d,%d,%d,%d)",

include/event.php

@@ -207,7 +207,7 @@ function event_store($arr) {
 
 	$arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
 	$arr['edited']  = (($arr['edited']) ? $arr['edited'] : datetime_convert());
-	$arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );	
+	$arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );
 	$arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
 	$arr['uri']     = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
 	$arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
@@ -263,7 +263,7 @@ function event_store($arr) {
 			`allow_gid` = '%s',
 			`deny_cid` = '%s',
 			`deny_gid` = '%s'
-			WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			WHERE `id` = %d AND `uid` = %d",
 
 			dbesc($arr['edited']),
 			dbesc($arr['start']),
@@ -291,7 +291,7 @@ function event_store($arr) {
 			$object .= '</object>' . "\n";
 
 
-			q("UPDATE `item` SET `body` = '%s', `object` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `edited` = '%s', `private` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			q("UPDATE `item` SET `body` = '%s', `object` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `edited` = '%s', `private` = %d WHERE `id` = %d AND `uid` = %d",
 				dbesc(format_event_bbcode($arr)),
 				dbesc($object),
 				dbesc($arr['allow_cid']),
@@ -390,7 +390,7 @@ function event_store($arr) {
 
 
 		if($item_id) {
-			q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
 				dbesc($plink),
 				intval($event['id']),
 				intval($arr['uid']),

include/files.php

@@ -0,0 +1,50 @@
+<?php
+function create_files_from_item($itemid) {
+	global $a;
+
+	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `file`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
+
+	if (!$messages)
+		return;
+
+	$message = $messages[0];
+
+	// Clean up all tags
+	q("DELETE FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d)",
+		intval(TERM_OBJ_POST),
+		intval($itemid),
+		intval(TERM_FILE),
+		intval(TERM_CATEGORY));
+
+	if ($message["deleted"])
+		return;
+
+	if (preg_match_all("/\[(.*?)\]/ism", $message["file"], $files))
+		foreach ($files[1] as $file)
+			$r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`) VALUES (%d, %d, %d, %d, '%s')",
+				intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_FILE), dbesc($file));
+
+	if (preg_match_all("/\<(.*?)\>/ism", $message["file"], $files))
+		foreach ($files[1] as $file)
+			$r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`) VALUES (%d, %d, %d, %d, '%s')",
+				intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), dbesc($file));
+}
+
+function create_files_from_itemuri($itemuri, $uid) {
+	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
+
+	if(count($messages)) {
+		foreach ($messages as $message)
+			create_files_from_item($message["id"]);
+	}
+}
+
+function update_files_for_items() {
+	$messages = q("SELECT `id` FROM `item` where file !=''");
+
+	foreach ($messages as $message) {
+		echo $message["id"]."\n";
+		create_files_from_item($message["id"]);
+	}
+}
+?>

include/follow.php

@@ -111,7 +111,7 @@ function new_contact($uid,$url,$interactive = false) {
 
 	if($ret['network'] === NETWORK_MAIL) {
 		$writeable = 1;
-		
+
 	}
 	if($ret['network'] === NETWORK_DIASPORA)
 		$writeable = 1;
@@ -123,13 +123,13 @@ function new_contact($uid,$url,$interactive = false) {
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
 		intval($uid),
 		dbesc($ret['poll'])
-	);			
+	);
 
 
 	if(count($r)) {
 		// update contact
 		if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
-			q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d",
 				intval(CONTACT_IS_FRIEND),
 				intval($subhub),
 				intval($r[0]['id']),
@@ -222,13 +222,13 @@ function new_contact($uid,$url,$interactive = false) {
 
 	$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
 
-	$r = q("UPDATE `contact` SET `photo` = '%s', 
+	$r = q("UPDATE `contact` SET `photo` = '%s',
 			`thumb` = '%s',
-			`micro` = '%s', 
-			`name-date` = '%s', 
-			`uri-date` = '%s', 
+			`micro` = '%s',
+			`name-date` = '%s',
+			`uri-date` = '%s',
 			`avatar-date` = '%s'
-			WHERE `id` = %d LIMIT 1
+			WHERE `id` = %d
 		",
 			dbesc($photos[0]),
 			dbesc($photos[1]),
@@ -237,7 +237,7 @@ function new_contact($uid,$url,$interactive = false) {
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($contact_id)
-		);			
+		);
 
 
 	// pull feed and consume it, which should subscribe to the hub.
@@ -262,7 +262,7 @@ function new_contact($uid,$url,$interactive = false) {
 		'$ostat_follow' => ''
 	));
 
-	$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+	$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
 			WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 			intval($uid)
 	);