From a33edb00424882258a90b138c634a466c92faf61 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 1 Sep 2011 18:02:08 -0700
Subject: [PATCH] infrastructure for personalised @ tags (no UI/settings form
 yet), allow own comments through statusnet connector

---
 addon/statusnet/statusnet.php | 5 ++++-
 boot.php                      | 4 ++--
 database.sql                  | 1 +
 mod/item.php                  | 3 ++-
 mod/photos.php                | 3 ++-
 update.php                    | 8 ++++++--
 zot.txt                       | 4 ++--
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
index 2f02ded54b..f1b35d6c04 100644
--- a/addon/statusnet/statusnet.php
+++ b/addon/statusnet/statusnet.php
@@ -355,7 +355,10 @@ function statusnet_post_hook(&$a,&$b) {
 
         logger('StatusNet post invoked');
 
-	if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (!$b['parent']) ) {
+	if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) {
+
+		// mike 2-9-11 there was a restriction to only allow this for top level posts
+		// now relaxed so should allow one's own comments to be forwarded through the connector as well. 
 
 		// Status.Net is not considered a private network
 		if($b['prvnets'])
diff --git a/boot.php b/boot.php
index 3578f3f333..e8b3d7ac18 100644
--- a/boot.php
+++ b/boot.php
@@ -7,9 +7,9 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1089' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1090' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1084      );
+define ( 'DB_UPDATE_VERSION',      1085      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index 9819914f78..432ce76938 100644
--- a/database.sql
+++ b/database.sql
@@ -58,6 +58,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `network` char(255) NOT NULL,
   `name` char(255) NOT NULL,
   `nick` char(255) NOT NULL,
+  `attag` char(255) NOT NULL,
   `photo` text NOT NULL, 
   `thumb` text NOT NULL,
   `micro` text NOT NULL,
diff --git a/mod/item.php b/mod/item.php
index b6ea8ff085..6ecca8f4a1 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -404,7 +404,8 @@ function item_post(&$a) {
 						);
 					}
 					else {
-						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+						$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+							dbesc($name),
 							dbesc($name),
 							intval($profile_uid)
 						);
diff --git a/mod/photos.php b/mod/photos.php
index cb13b76036..b74ca85d71 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -414,7 +414,8 @@ function photos_post(&$a) {
 								);
 							}
 							else {
-								$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+								$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+									dbesc($name),
 									dbesc($name),
 									intval($page_owner_uid)
 								);
diff --git a/update.php b/update.php
index 14bc48ab71..80761cce45 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1084 );
+define( 'UPDATE_VERSION' , 1085 );
 
 /**
  *
@@ -706,4 +706,8 @@ function update_1083() {
 	`contact` INT NOT NULL
 	) ENGINE = MYISAM ;");
 
-}
\ No newline at end of file
+}
+
+function update_1084() {
+	q("ALTER TABLE `contact` ADD `attag` CHAR( 255 ) NOT NULL AFTER `nick` ");
+}
diff --git a/zot.txt b/zot.txt
index 93fdf3b9d8..dd9f709826 100644
--- a/zot.txt
+++ b/zot.txt
@@ -114,7 +114,7 @@ listed in the To:, Cc:, or Bcc: addresses matches the webfinger address of
 the "owner" of the endpoint.
 
 	3. The current endpoint is a bulk delivery endpoint. The bulk delivery
-ednpoint is defined elsewhere in this document. The bulk delivery agent
+endpoint is defined elsewhere in this document. The bulk delivery agent
 will deliver to all local addresses found in the address lists. 
 
 zot:sig
@@ -243,7 +243,7 @@ and allow authenticated browsing to other resources on the website.
 
 Only authentication via OpenID is defined in this version of the specification.
 
-This can be used to provide access control to any web resource to any 
+This can be used to provide access control of any web resource to any 
 webfinger identity on the internet.
 
 *********