a few more fsw tweaks

11 files changed, 48 insertions, 21 deletions

diff --git a/include/items.php b/include/items.php
index 6cdf5f0f5..fa07727de 100644
--- a/include/items.php
+++ b/include/items.php
@@ -935,8 +935,12 @@ function consume_feed($xml,$importer,$contact, &$hub) {
 				if(! is_array($contact))
 					return;
 
-				if($contact['network'] === 'stat' && strlen($datarray['title']))
-					unset($datarray['title']);
+				if($contact['network'] === 'stat') {
+					if(strlen($datarray['title']))
+						unset($datarray['title']);
+					if(($contact['rel'] == REL_VIP) || ($contact['rel'] == REL_BUD))
+						$datarray['last-child'] = 1;
+				}
 				$datarray['parent-uri'] = $item_id;
 				$datarray['uid'] = $importer['uid'];
 				$datarray['contact-id'] = $contact['id'];
@@ -960,7 +964,7 @@ function new_follower($importer,$contact,$datarray,$item) {
 
 	if(is_array($contact)) {
 		if($contact['network'] == 'stat' && $contact['rel'] == REL_FAN) {
-			$q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			$r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval(REL_BUD),
 				intval($contact['id']),
 				intval($importer['uid'])
@@ -1010,7 +1014,7 @@ function new_follower($importer,$contact,$datarray,$item) {
 
 function lose_follower($importer,$contact,$datarray,$item) {
 
-	if($contact['rel'] == REL_BUD) {
+	if(($contact['rel'] == REL_BUD) || ($contact['rel'] == REL_FAN)) {
 		q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
 			intval(REL_FAN),
 			intval($contact['id'])
diff --git a/include/notifier.php b/include/notifier.php
index 9e4a7102e..069f3bdf2 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -72,7 +72,7 @@
 			killme();
 	}
 
-	$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` 
+	$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` 
 		FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 		intval($uid)
diff --git a/include/poller.php b/include/poller.php
index e8bdc94a3..e08d76508 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -14,7 +14,6 @@
 	require_once('datetime.php');
 	require_once('simplepie/simplepie.inc');
 	require_once('include/items.php');
-
 	require_once('include/Contact.php');
 
 	$debugging = get_config('system','debugging');
diff --git a/include/salmon.php b/include/salmon.php
index de0ea3802..e93ec23d7 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -136,7 +136,7 @@ EOT;
 
 	$signature  = base64url_encode($rsa->sign($data . $precomputed));
 
-	$signature2 = base64url_encode($rsa->sign($data));
+	$signature2  = base64url_encode($rsa->sign($data));
 
 	$salmon_tpl = load_view_file('view/magicsig.tpl');
 	$salmon = replace_macros($salmon_tpl,array(
@@ -154,7 +154,7 @@ EOT;
 	));
 
 	$a = get_app();
-	$return_code = trim($a->get_curl_code);
+	$return_code = trim($a->get_curl_code());
 
 	// check for success, e.g. 2xx
 
@@ -177,7 +177,8 @@ EOT;
 			'Content-type: application/magic-envelope+xml',
 			'Content-length: ' . strlen($salmon)
 		));
-		$return_code = trim($a->get_curl_code);
+		$return_code = trim($a->get_curl_code());
+
 	}
  
 	return;
diff --git a/mod/contacts.php b/mod/contacts.php
index 936063715..beb1f1ecb 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -196,10 +196,11 @@ function contacts_content(&$a) {
 			'$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00') 
 				? t('Never') 
 				: datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
-			'$profile_select' => contact_profile_assign($r[0]['profile-id']),
+			'$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)),
 			'$contact_id' => $r[0]['id'],
 			'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
 			'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
+			'$insecure' => (($r[0]['network'] === 'dfrn') ? '' : load_view_file('view/insecure_net.tpl')),
 			'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
 			'$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
 			'$rating' => contact_reputation($r[0]['rating']),
diff --git a/mod/salmon.php b/mod/salmon.php
index 74377f9e9..54353132a 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -195,8 +195,8 @@ function salmon_post(&$a) {
 	*
 	*/
 
-	$r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s') AND `uid` = %d 
-		AND `readonly` = 0 LIMIT 1",
+	$r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s') 
+		AND `uid` = %d LIMIT 1",
 		dbesc($author_link),
 		dbesc($author_link),
 		intval($importer['uid'])
@@ -206,6 +206,13 @@ function salmon_post(&$a) {
 			file_put_contents('salmon.out',"\n" . 'Author unknown to us.' . "\n", FILE_APPEND);
 
 	}	
+	if((count($r)) && ($r[0]['readonly'])) {
+		if($debugging)
+			file_put_contents('salmon.out',"\n" . 'Ignoring this author.' . "\n", FILE_APPEND);
+		salmon_return(200);
+		// NOTREACHED
+	}
+
 
 	require_once('include/items.php');
 
diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index b5f2dcfea..32a3fff22 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -49,11 +49,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 
 
-	$r = q("SELECT `id`, `name`, `url` FROM `contact` 
-		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `network` = 'dfrn' 
+	$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
+		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 
 		$sql_extra
 		ORDER BY `name` ASC ",
-		$_SESSION['uid']
+		intval(local_user())
 	);
 
 	if(count($r)) {
@@ -62,7 +62,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 				$selected = " selected=\"selected\" ";
 			else
 				$selected = '';
-			$o .= "<option value=\"{$rr['id']}\" $selected  title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
+			if($rr['network'] === 'stat')
+				$disabled = ' disabled="true" ' ;
+			else
+				$disabled = '';
+			$o .= "<option value=\"{$rr['id']}\" $selected  $disabled title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
 		}
 	
 	}
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index acea1da4e..96abf0028 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -31,6 +31,7 @@
 	</div>
 	<div id="contact-edit-end" ></div>
 
+$insecure
 $blocked
 $ignored
 
diff --git a/view/contact_selectors.php b/view/contact_selectors.php
index 7c7abfc7c..ac1e38e4f 100644
--- a/view/contact_selectors.php
+++ b/view/contact_selectors.php
@@ -1,10 +1,13 @@
 <?php
 
 
-function contact_profile_assign($current) {
+function contact_profile_assign($current,$foreign_net) {
 
 	$o = '';
-	$o .= "<select id=\"contact-profile-selector\" name=\"profile-assign\" />\r\n";
+
+	$disabled = (($foreign_net) ? ' disabled="true" ' : '');
+
+	$o .= "<select id=\"contact-profile-selector\" $disabled name=\"profile-assign\" />\r\n";
 
 	$r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
                         intval($_SESSION['uid']));
diff --git a/view/magicsig.tpl b/view/magicsig.tpl
index 6707493ca..622e7c5a2 100644
--- a/view/magicsig.tpl
+++ b/view/magicsig.tpl
@@ -5,5 +5,5 @@ $data
 </me:data>
 <me:encoding>$encoding</me:encoding>
 <me:alg>$algorithm</me:alg>
-<me:sig keyash="$keyhash">$signature</me:sig>
+<me:sig keyhash="$keyhash">$signature</me:sig>
 </me:env>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 191f2d50f..17e619dea 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -1288,9 +1288,8 @@ input#dfrn-url {
 	margin-left: 50px;
 }
 
-#block-message, #ignore-message {
+#block-message, #ignore-message, #profile-edit-insecure {
 	margin-top: 20px;
-	width: 180px;
 	color: #FF0000;
 	font-size: 1.1em;
 	border: 1px solid #FF8888;
@@ -1298,6 +1297,14 @@ input#dfrn-url {
 	padding: 10px;
 }
 
+#block-message, #ignore-message {
+	width: 180px;
+}
+
+#profile-edit-insecure {
+	width: 600px;
+}
+
 .profile-tabs {
 	float: left;
 	padding: 4px;