From a598f17e6d95d8a82df2994d61bfab74271dfe58 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 30 Jan 2011 18:25:41 -0800
Subject: wrong ref in ssl policy

---
 include/notifier.php | 2 +-
 include/poller.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/notifier.php b/include/notifier.php
index dd5d55ed0..59e29d7d1 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -363,7 +363,7 @@ function notifier_run($argv, $argc){
 					continue;
 				$params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
 				post_url($h,$params);
-				logger('pubsub: publish: ' . $h . ' returned ' . $a->get_curl_code());
+				logger('pubsub: publish: ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
 				if(count($hubs) > 1)
 					sleep(7);				// try and avoid multiple hubs responding at precisely the same time
 			}
diff --git a/include/poller.php b/include/poller.php
index 1003b2f08..0dbc6f583 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -76,7 +76,7 @@ function poller_run($argv, $argc){
 				$contact['priority'] = (($interval !== false) ? intval($interval) : 3);
 				$hub_update = false;
 
-				if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+				if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)
 						$hub_update = true;
 			}
 
-- 
cgit v1.2.3


From 3eefe8b50003c858d4930c03cc06d2679a14347c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 30 Jan 2011 19:38:03 -0800
Subject: more ssl_policy cleanup, allow manual feed update per contact when
 hub is whacked, log feed parse errors

---
 include/items.php  | 4 ++++
 include/poller.php | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index e238280fc..a5991d663 100644
--- a/include/items.php
+++ b/include/items.php
@@ -903,6 +903,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
 		$feed->enable_order_by_date(false);
 	$feed->init();
 
+	if($feed->error())
+		logger('consume_feed: Error parsing XML: ' . $feed->error());
+
+
 	// Check at the feed level for updated contact name and/or photo
 
 	$name_updated  = '';
diff --git a/include/poller.php b/include/poller.php
index 0dbc6f583..4567a5cfc 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -58,6 +58,9 @@ function poller_run($argv, $argc){
 
 	foreach($contacts as $contact) {
 
+			if($manual_id)
+				$contact['last-update'] = '0000-00-00 00:00:00';
+
 		if($contact['priority'] || $contact['subhub']) {
 
 			$hub_update = true;
-- 
cgit v1.2.3


From 6935d34e7683fa2cf43092b39346c3c43cb8d38d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 30 Jan 2011 19:49:26 -0800
Subject: disable "take me home" hotkey, different on FF (shift-home), IE ($).

---
 include/main.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index fcd1d6fee..a24f0ae08 100644
--- a/include/main.js
+++ b/include/main.js
@@ -44,12 +44,13 @@
 					$('#pause').html('');
 				}
 			}
-			if(event.keyCode == '36' && event.shiftKey == true) {
-				if(homebase !== undefined) {
-					event.preventDefault();
-					document.location = homebase;
-				}
-			}
+// this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
+//			if(event.keyCode == '36' && event.shiftKey == true) {
+//				if(homebase !== undefined) {
+//					event.preventDefault();
+//					document.location = homebase;
+//				}
+//			}
 		});					
 	});
 
-- 
cgit v1.2.3


From d8877b88d6c26e29019312f02297411817692361 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 30 Jan 2011 22:45:02 -0800
Subject: limit privacy ACL's to networks which can handle privacy

---
 include/acl_selectors.php | 17 +++++++++--------
 include/main.js           |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index d0952421e..554782a82 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -30,7 +30,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 
 
-function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false) {
+function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) {
 
 	$o = '';
 
@@ -43,6 +43,10 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
 	}
 
+	if($privmail || $privatenet) {
+		$sql_extra .= " AND `network` IN ( 'dfrn' ) ";
+	}	
+
 	if($privmail)
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
 	else 
@@ -61,11 +65,8 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 				$selected = " selected=\"selected\" ";
 			else
 				$selected = '';
-			if(($privmail) && ($rr['network'] === 'stat'))
-				$disabled = ' disabled="true" ' ;
-			else
-				$disabled = '';
-			$o .= "<option value=\"{$rr['id']}\" $selected  $disabled title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
+
+			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
 		}
 	
 	}
@@ -110,7 +111,7 @@ function populate_acl($user = null,$celeb = false) {
 	$o .= '</div>';
 	$o .= '<div id="contact_allow_wrapper">';
 	$o .= '<label id="acl-allow-contact-label" for="contact_allow" >' . t('Contacts') . '</label>';
-	$o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb);
+	$o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb,true);
 	$o .= '</div>';
 	$o .= '</div>' . "\r\n";
 	$o .= '<div id="acl-allow-end"></div>' . "\r\n";
@@ -125,7 +126,7 @@ function populate_acl($user = null,$celeb = false) {
 	$o .= '</div>';
 	$o .= '<div id="contact_deny_wrapper" >';
 	$o .= '<label id="acl-deny-contact-label" for="contact_deny" >' . t('Contacts') . '</label>';
-	$o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb);
+	$o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb,true);
 	$o .= '</div>';
 	$o .= '</div>' . "\r\n";
 	$o .= '<div id="acl-deny-end"></div>' . "\r\n";
diff --git a/include/main.js b/include/main.js
index a24f0ae08..63b34bd21 100644
--- a/include/main.js
+++ b/include/main.js
@@ -45,6 +45,7 @@
 				}
 			}
 // this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
+// update: incompatible usage of onKeyDown vs onKeyPress
 //			if(event.keyCode == '36' && event.shiftKey == true) {
 //				if(homebase !== undefined) {
 //					event.preventDefault();
-- 
cgit v1.2.3


From 23d1b994ccff17567391eb9b1572321b1731189c Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 10:38:49 +0100
Subject: Move [embed] bbtag from oembed plugin to core

---
 include/bbcode.php |  5 ++++-
 include/oembed.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 include/oembed.php

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 8382cc804..c17e5dded 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,5 +1,5 @@
 <?php
-
+require_once("include/oembed.php");
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendika - Mike Macgirvin
 
@@ -93,6 +93,9 @@ function bbcode($Text) {
         $Text = preg_replace("/\[youtube\]http:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); 
 	$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
+	// oembed tag
+	$Text = oembed_bbcode($Text);
+
 	call_hooks('bbcode',$Text);
 
 	return $Text;
diff --git a/include/oembed.php b/include/oembed.php
new file mode 100644
index 000000000..d9bf9f67c
--- /dev/null
+++ b/include/oembed.php
@@ -0,0 +1,48 @@
+<?php
+function oembed_replacecb($matches){
+  $embedurl=$matches[1];
+  $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
+  $txt = fetch_url($ourl);
+  $j = json_decode($txt);
+  $ret="<!-- oembed $embedurl -->";
+  switch ($j->type) {
+    case "video": {
+       if (isset($j->thumbnail_url)) {
+         $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
+         $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
+         $ret = "<a href='#' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' >";
+         $ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>";
+         $ret.= "</a>";
+       } else {
+         $ret=$j->html;
+       }
+       $ret.="<br>";
+    }; break;
+    case "photo": {
+      $ret = "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
+      $ret.="<br>";
+    }; break;  
+    case "link": {
+      //$ret = "<a href='".$embedurl."'>".$j->title."</a>";
+    }; break;  
+    case "rich": {
+      // not so safe.. 
+      $ret = "<blockquote>".$j->html."</blockquote>";
+    }; break;
+  }
+  
+  $embedlink = (isset($j->title))?$j->title:$embedurl;
+  $ret .= "<a href='$embedurl'>$embedlink</a>";
+  if (isset($j->author_name)) $ret.=" by ".$j->author_name;
+  if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
+  $ret.="<!-- /oembed $embedurl -->";
+  return $ret;
+}
+
+function oembed_bbcode($text){
+	$stopoembed = get_config("system","no_oembed");
+	if ($stopoembed == True):
+		return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", "$1" ,$text);
+	return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text);
+}
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 6ea87223d3ba5d9ecc1fa57453207e1645819fe5 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 11:00:35 +0100
Subject: Add 'system''no_oembed' config option

---
 include/oembed.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/oembed.php b/include/oembed.php
index d9bf9f67c..cec9cf75a 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -10,7 +10,7 @@ function oembed_replacecb($matches){
        if (isset($j->thumbnail_url)) {
          $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
          $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
-         $ret = "<a href='#' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' >";
+         $ret = "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' >";
          $ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>";
          $ret.= "</a>";
        } else {
@@ -41,8 +41,9 @@ function oembed_replacecb($matches){
 
 function oembed_bbcode($text){
 	$stopoembed = get_config("system","no_oembed");
-	if ($stopoembed == True):
-		return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", "$1" ,$text);
+	if ($stopoembed == true){
+		return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text);
+	}
 	return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text);
 }
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 49ea05b8ff27c31924ddf94c582ab4260faf56c2 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 16:45:58 +0100
Subject: use microformat to mark html from [embed] tag, convert html with
 oembed microformat to [embed] tag

---
 include/bbcode.php |  2 +-
 include/items.php  |  3 +++
 include/oembed.php | 44 ++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 44 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index c17e5dded..eb0806dc5 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -94,7 +94,7 @@ function bbcode($Text) {
 	$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
 	// oembed tag
-	$Text = oembed_bbcode($Text);
+	$Text = oembed_bbcode2html($Text);
 
 	call_hooks('bbcode',$Text);
 
diff --git a/include/items.php b/include/items.php
index a5991d663..f204745bb 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('bbcode.php');
+require_once('oembed.php');
 
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
@@ -395,6 +396,8 @@ function get_atom_elements($feed,$item) {
 		$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
 			'[youtube]$1[/youtube]', $res['body']);
 
+		$res['body'] = oembed_html2bbcode($res['body']);
+	
 		$config = HTMLPurifier_Config::createDefault();
 		$config->set('Cache.DefinitionImpl', null);
 
diff --git a/include/oembed.php b/include/oembed.php
index cec9cf75a..f9441b370 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -4,7 +4,7 @@ function oembed_replacecb($matches){
   $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
   $txt = fetch_url($ourl);
   $j = json_decode($txt);
-  $ret="<!-- oembed $embedurl -->";
+  $ret="<span class='oembed'>";
   switch ($j->type) {
     case "video": {
        if (isset($j->thumbnail_url)) {
@@ -32,18 +32,54 @@ function oembed_replacecb($matches){
   }
   
   $embedlink = (isset($j->title))?$j->title:$embedurl;
-  $ret .= "<a href='$embedurl'>$embedlink</a>";
+  $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
   if (isset($j->author_name)) $ret.=" by ".$j->author_name;
   if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
-  $ret.="<!-- /oembed $embedurl -->";
+  $ret.="</span>";
   return $ret;
 }
 
-function oembed_bbcode($text){
+function oembed_bbcode2html($text){
 	$stopoembed = get_config("system","no_oembed");
 	if ($stopoembed == true){
 		return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text);
 	}
 	return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text);
 }
+
+
+function oe_build_xpath($attr, $value){
+	// http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html
+	return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'";
+}
+
+function oe_get_inner_html( $node ) {
+    $innerHTML= '';
+    $children = $node->childNodes;
+    foreach ($children as $child) {
+        $innerHTML .= $child->ownerDocument->saveXML( $child );
+    }
+    return $innerHTML;
+} 
+
+/**
+ * Find <span class='oembed'>..<a href='url' rel='oembed'>..</a></span>
+ * and replace it with [embed]url[/embed]
+ */
+function oembed_html2bbcode($text) {
+	$dom = DOMDocument::loadHTML($text);
+	$xpath = new DOMXPath($dom);
+	$attr = "oembed";
+	
+	$xattr = oe_build_xpath("class","oembed");
+	$entries = $xpath->query("//span[$xattr]");
+	
+	$xattr = oe_build_xpath("rel","oembed");
+	foreach($entries as $e) {
+		$href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
+		if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[embed]"), $e);
+	}
+	return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); 
+}
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 3dbca2a8041540a9e8a336db21fc28fc3b6bc5d7 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 17:16:35 +0100
Subject: delete old cache in poller.php

---
 include/poller.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 4567a5cfc..2ba285b7b 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -30,6 +30,10 @@ function poller_run($argv, $argc){
 	$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 	//proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
 	proc_run($php_path,"include/queue.php");
+	
+	// clear old cache
+	q("DELETE FROM `cache` WHERE `updated`<'%s'",
+		dbesc(datetime_convert('UTC','UTC',"now - 30 days")));
 
 
 	$hub_update = false;
-- 
cgit v1.2.3


From bdbbfe17b0ab58a89a0673f5409d30870afd0b9d Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 17:23:55 +0100
Subject: cache oembed request

---
 include/oembed.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/oembed.php b/include/oembed.php
index f9441b370..a130357ab 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,8 +1,20 @@
 <?php
 function oembed_replacecb($matches){
   $embedurl=$matches[1];
-  $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
-  $txt = fetch_url($ourl);
+  
+  $r = q("SELECT v FROM `cache` WHERE k='%s'",
+  		dbesc($embedurl));
+  if(count($r)){
+  	$txt = $r[0]['v'];
+  } else {
+	  $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
+	  $txt = fetch_url($ourl);
+	  //save in cache
+	  q("INSERT INTO `cache` VALUES ('%s','%s','%s')",
+	  	dbesc($embedurl),
+		dbesc($txt),
+		dbesc(datetime_convert()));
+  }
   $j = json_decode($txt);
   $ret="<span class='oembed'>";
   switch ($j->type) {
-- 
cgit v1.2.3


From 1908c7ad8217f35bffd32458de2ab5646f57affe Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 14:01:38 -0800
Subject: deliver up to 150 contacts per person using dfrn - in case hub is
 whacked

---
 include/notifier.php | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/notifier.php b/include/notifier.php
index 59e29d7d1..87095e814 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -255,7 +255,7 @@ function notifier_run($argv, $argc){
 		$recip_str = implode(', ', $recipients);
 
 
-	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 ",
+	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ",
 		dbesc($recip_str)
 	);
 	if(! count($r)){
@@ -370,6 +370,54 @@ function notifier_run($argv, $argc){
 		}
 	}
 
+	if($notify_hub) {
+
+		/**
+		 *
+		 * If you have less than 150 dfrn friends and it's a public message,
+		 * we'll just go ahead and push them out securely with dfrn/rino.
+		 * If you've got more than that, you'll have to rely on PuSH delivery.
+		 *
+		 */
+
+		$max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxdeliver')));
+				
+
+		/**
+		 *
+		 * Only get the bare essentials and go back for the full record. 
+		 * If you've got a lot of friends and we grab all the details at once it could exhaust memory. 
+		 *
+		 */
+
+		$r = q("SELECT `id`, `name` FROM `contact` 
+			WHERE `network` = 'dfrn' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
+			AND `rel` != %d ",
+			intval($owner['uid']),
+			intval(REL_FAN)
+		);
+
+		if((count($r)) && ($max_allowed < count($r))) {
+			foreach($r as $rr) {
+
+				/* Don't deliver to folks who have already been delivered to */
+
+				if(! in_array($rr['id'], $conversants)) {
+					$n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+							intval($rr['id'])
+					);
+					if(count($n)) {
+					
+						logger('notifier: dfrnpubdelivery: ' . $n[0]['name']);
+						$deliver_status = dfrn_deliver($owner,$n[0],$atom);
+					}
+				}
+				else
+					logger('notifier: dfrnpubdelivery: ignoring ' . $rr['name']);
+			}
+		}
+	}
+
 	return;
 }
 
-- 
cgit v1.2.3


From e2544abd503ddcbd98a31c75b528aac0c980df35 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 19:49:56 -0800
Subject: truncate names in acl selector

---
 include/acl_selectors.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 554782a82..63756ce3e 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -17,8 +17,9 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 				$selected = " selected=\"selected\" ";
 			else
 				$selected = '';
+			$trimmed = substr($rr['name'],0,12);
 
-			$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['name']}</option>\r\n";
+			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n";
 		}
 	
 	}
@@ -66,7 +67,9 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 			else
 				$selected = '';
 
-			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
+			$trimmed = substr($rr['name'],0,24);
+
+			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
 		}
 	
 	}
-- 
cgit v1.2.3


From 2cd1da54627bc298baab0ad5119a946713bf07a5 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 19:53:40 -0800
Subject: readjust name length limits - acl selector

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

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 63756ce3e..269dc3e34 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -67,7 +67,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 			else
 				$selected = '';
 
-			$trimmed = substr($rr['name'],0,24);
+			$trimmed = substr($rr['name'],0,22);
 
 			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
 		}
-- 
cgit v1.2.3