name change continued, social graph tools and stuctures, fix for spanish province name

4 files changed, 14 insertions, 10 deletions

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 5d789f480..af4a5aece 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -143,8 +143,8 @@ function dfrn_request_post(&$a) {
 					 */
 
 					$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `nick`, `photo`, `site-pubkey`,
-						`request`, `confirm`, `notify`, `poll`, `network`, `aes_allow`) 
-						VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+						`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`) 
+						VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
 						intval(local_user()),
 						datetime_convert(),
 						dbesc($dfrn_url),
@@ -156,6 +156,7 @@ function dfrn_request_post(&$a) {
 						$parms['dfrn-confirm'],
 						$parms['dfrn-notify'],
 						$parms['dfrn-poll'],
+						$parms['dfrn-poco'],
 						dbesc(NETWORK_DFRN),
 						intval($aes_allow)
 					);
@@ -371,8 +372,8 @@ function dfrn_request_post(&$a) {
 
 				dbesc_array($parms);
 				$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
-					`request`, `confirm`, `notify`, `poll`, `network` )
-					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+					`request`, `confirm`, `notify`, `poll`, `poco`, `network` )
+					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
 					intval($uid),
 					datetime_convert(),
 					$parms['url'],
@@ -385,6 +386,7 @@ function dfrn_request_post(&$a) {
 					$parms['dfrn-confirm'],
 					$parms['dfrn-notify'],
 					$parms['dfrn-poll'],
+					$parms['dfrn-poco'],
 					dbesc(NETWORK_DFRN)
 				);
 
@@ -635,14 +637,14 @@ function dfrn_request_content(&$a) {
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Friend/Connection Request'),
-			'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
+			'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
 			'$pls_answer' => t('Please answer the following:'),
 			'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
 			'$yes' => t('Yes'),
 			'$no' => t('No'),
 			'$add_note' => t('Add a personal note:'),
 			'$page_desc' => $page_desc,
-			'$friendika' => t('Friendika'),
+			'$friendika' => t('Friendica'),
 			'$statusnet' => t('StatusNet/Federated Social Web'),
 			'$diaspora' => t('Diaspora'),
 			'$diasnote' => t('- please share from your own site as noted above'),
diff --git a/mod/follow.php b/mod/follow.php
index 77c8ae18f..4328e7fe0 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -100,9 +100,9 @@ function follow_post(&$a) {
 			$new_relation = CONTACT_IS_FOLLOWER;
 
 		// create contact record 
-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `batch`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
 			`writable`, `blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
 			dbesc($ret['url']),
@@ -111,6 +111,7 @@ function follow_post(&$a) {
 			dbesc($ret['batch']),
 			dbesc($ret['notify']),
 			dbesc($ret['poll']),
+			dbesc($ret['poco']),
 			dbesc($ret['name']),
 			dbesc($ret['nick']),
 			dbesc($ret['photo']),
diff --git a/mod/poco.php b/mod/poco.php
index 2c2aeb656..21ee4df69 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -98,11 +98,11 @@ function poco_init(&$a) {
 				if($fields_ret['displayName'])
 					$entry['displayName'] = $rr['name'];
 				if($fields_ret['urls'])
-					$entry['urls'] = array('value' => $rr['url'], 'type' => 'profile');
+					$entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
 				if($fields_ret['preferredUsername'])
 					$entry['preferredUsername'] = $rr['nick'];
 				if($fields_ret['photos'])
-					$entry['photos'] = array('value' => $rr['photo'], 'type' => 'profile');
+					$entry['photos'] = array(array('value' => $rr['photo'], 'type' => 'profile'));
 				$ret['entry'][] = $entry;
 			}
 		}
diff --git a/mod/profile.php b/mod/profile.php
index 6d67ab74b..f68006af5 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -46,6 +46,7 @@ function profile_init(&$a) {
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
 	foreach($dfrn_pages as $dfrn)
 		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".$a->get_baseurl()."/poco/{$which}\" />\r\n";
 
 }