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: [PATCH 01/15] Move [embed] bbtag from oembed plugin to core

---
 addon/oembed/oembed.php | 44 -------------------------------------
 include/bbcode.php      |  5 ++++-
 include/oembed.php      | 48 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 45 deletions(-)
 create mode 100644 include/oembed.php

diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php
index 82183f3cce..4bbd75387a 100644
--- a/addon/oembed/oembed.php
+++ b/addon/oembed/oembed.php
@@ -10,13 +10,11 @@
 function oembed_install() {
   register_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool');
   register_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header');
-  register_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode');
 }
 
 function oembed_uninstall() {
   unregister_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool');
   unregister_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header');
-  unregister_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode');
 }
 
 function oembed_hook_page_header($a, &$b){
@@ -53,49 +51,7 @@ function oembed_hook_jot_tool($a, &$b) {
   ';
 }
 
-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_hook_bbcode($a, &$text){
-  $text = preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text);
-}
 
 
 ?>
\ No newline at end of file
diff --git a/include/bbcode.php b/include/bbcode.php
index 8382cc8044..c17e5dded3 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 0000000000..d9bf9f67cf
--- /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

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: [PATCH 02/15] Add 'system''no_oembed' config option

---
 htconfig.php       | 5 ++++-
 include/oembed.php | 7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htconfig.php b/htconfig.php
index 13c065e697..5f5c76cbd7 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -72,4 +72,7 @@ $a->config['system']['rino_encrypt'] = true;
 $a->config['system']['addon'] = 'js_upload';
 
 
- 
\ No newline at end of file
+// Disable oembed embedding
+// This disable the conversion of [embed]$url[/embed] tag in html
+// $a->config['system']['no_oembed'] = true;
+
diff --git a/include/oembed.php b/include/oembed.php
index d9bf9f67cf..cec9cf75af 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

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: [PATCH 03/15] 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(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index c17e5dded3..eb0806dc52 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 a5991d663b..f204745bb4 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 cec9cf75af..f9441b3709 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

From 6efc78e0e42d651211116739579dc6319ca9c5b1 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 31 Jan 2011 17:10:36 +0100
Subject: [PATCH 04/15] add cache table

---
 boot.php     | 2 +-
 database.sql | 6 +++++-
 update.php   | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 6cbb4f07c7..ac010c19de 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1033   );
+define ( 'BUILD_ID',               1034   );
 define ( 'FRIENDIKA_VERSION',      '2.10.0902' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
diff --git a/database.sql b/database.sql
index 54950f0fd1..817fd09226 100644
--- a/database.sql
+++ b/database.sql
@@ -471,4 +471,8 @@ CREATE TABLE IF NOT EXISTS `event` (
 `deny_gid` MEDIUMTEXT NOT NULL
 ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
 
-
+CREATE TABLE IF NOT EXISTS 'cache' (
+ `k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
+ `v` TEXT NOT NULL,
+ `updated` DATETIME NOT NULL
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
diff --git a/update.php b/update.php
index 0bd58d6d48..f7bf9da1ed 100644
--- a/update.php
+++ b/update.php
@@ -320,3 +320,11 @@ function update_1031() {
 function update_1032() {
 	q("ALTER TABLE `profile` ADD `pdesc` CHAR( 255 ) NOT NULL AFTER `name` ");
 }
+
+function update_1033() {
+	q("CREATE TABLE IF NOT EXISTS `cache` (
+ 		`k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
+ 		`v` TEXT NOT NULL,
+ 		`updated` DATETIME NOT NULL
+		) ENGINE = MYISAM DEFAULT CHARSET=utf8;");
+}

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: [PATCH 05/15] delete old cache in poller.php

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

diff --git a/include/poller.php b/include/poller.php
index 4567a5cfc3..2ba285b7b6 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;

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: [PATCH 06/15] cache oembed request

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

diff --git a/include/oembed.php b/include/oembed.php
index f9441b3709..a130357abf 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) {

From 1908c7ad8217f35bffd32458de2ab5646f57affe Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 14:01:38 -0800
Subject: [PATCH 07/15] 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(-)

diff --git a/include/notifier.php b/include/notifier.php
index 59e29d7d1f..87095e814f 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;
 }
 

From fc20fb17c299100fd39e900f20c70d823baaebdf Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 14:21:23 -0800
Subject: [PATCH 08/15] force text paste in editor

---
 view/en/jot-header.tpl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index b687f65a69..93eb440a4e 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -2,17 +2,20 @@
 <script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
+var editor;
+
 tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
+	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "center",
 	theme_advanced_blockformats : "blockquote,code",
+	paste_text_sticky : true,
 	entity_encoding : "raw",
 	add_unload_trigger : false,
 	remove_linebreaks : false,
@@ -43,8 +46,13 @@ tinyMCE.init({
 				$('#character-counter').addClass('red');
 			}
 			$('#character-counter').text(text);
-    		});
-     	}
+    	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
+
+	}
 });
 
 </script>

From 8965db24ccb0793daebd37adc25e769e52492565 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 18:18:28 -0800
Subject: [PATCH 09/15] post to email recips (backend)

---
 mod/item.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index cc1886c17b..7125ae1f49 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -422,12 +422,39 @@ function item_post(&$a) {
 
 	logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &");
 
-  proc_run($php_path, "include/notifier.php", $notify_type, "$post_id");
+	proc_run($php_path, "include/notifier.php", $notify_type, "$post_id");
 
 	$datarray['id'] = $post_id;
 
 	call_hooks('post_local_end', $datarray);
- 
+
+	if(strlen($emailcc) && $profile_uid == local_user()) {
+		$erecips = explode(',', $emailcc);
+		if(count($erecips)) {
+			foreach($erecips as $recip) {
+				$addr = trim($recip);
+				if(! strlen($addr))
+					continue;
+				$disclaimer = '<hr />' . t('This message was sent to you by ') . $a->user['username'] 
+					. t(', a member of the Friendika social network.') . '<br />';
+				$disclaimer .= t('You may visit them online at') . ' ' 
+					. $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '<br />';
+				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '<br />'; 
+
+				$subject  = '[Friendika]' . ' ' . $a->user['username'] . ' ' . t('posted an update.');
+				$headers  = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n";
+				$headers .= 'MIME-Version: 1.0' . "\n";
+				$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+				$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
+				$link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
+				$html    = prepare_body($datarray);
+				$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
+				@mail($addr, $subject, $message, $headers);
+			}
+		}
+	}
+
+
 
 	goaway($a->get_baseurl() . "/" . $_POST['return'] );
 	return; // NOTREACHED

From 837cce8a75e884f76a67aef5ee47a9363b96fbcc Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 19:07:13 -0800
Subject: [PATCH 10/15] email cc recipients (front end)

---
 mod/network.php | 2 ++
 mod/profile.php | 2 ++
 view/de/jot.tpl | 6 +++++-
 view/en/jot.tpl | 6 +++++-
 view/fr/jot.tpl | 7 ++++++-
 view/it/jot.tpl | 7 ++++++-
 6 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/mod/network.php b/mod/network.php
index 50d7134c17..80edca1d02 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -87,6 +87,8 @@ function network_content(&$a, $update = 0) {
 			'$baseurl' => $a->get_baseurl(),
 			'$defloc' => $a->user['default-location'],
 			'$visitor' => 'block',
+			'$emailcc' => t('CC: email addresses'),
+			'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 			'$lockstate' => $lockstate,
 			'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
 			'$bang' => (($group) ? '!' : ''),
diff --git a/mod/profile.php b/mod/profile.php
index c84b493c50..91c1ba6d85 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -144,6 +144,8 @@ function profile_content(&$a, $update = 0) {
 				'$return_path' => $a->cmd,
 				'$visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
 				'$lockstate' => $lockstate,
+				'$emailcc' => t('CC: email addresses'),
+				'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 				'$bang' => '',
 				'$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
 				'$profile_uid' => $a->profile['profile_uid'],
diff --git a/view/de/jot.tpl b/view/de/jot.tpl
index f42f37156e..d86d8f8470 100644
--- a/view/de/jot.tpl
+++ b/view/de/jot.tpl
@@ -40,8 +40,12 @@
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Bitte warten" title="Bitte warten" style="display: none;" />
 	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Berechtigungseinstellungen" title="Berechtigungseinstellungen" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Berechtigungseinstellungen" title="Berechtigungseinstellungen" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper');" />$bang</div>
 	<div id="profile-jot-perms-end"></div>
+	<div id="profile-jot-email-wrapper" style="display: none;" >
+	<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
+	<div id="profile-jot-email-end"></div>
+	</div>
 	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
 </div>
 
diff --git a/view/en/jot.tpl b/view/en/jot.tpl
index de88fb84f7..d2a1014e72 100644
--- a/view/en/jot.tpl
+++ b/view/en/jot.tpl
@@ -40,8 +40,12 @@
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
 	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper');" />$bang</div>
 	<div id="profile-jot-perms-end"></div>
+	<div id="profile-jot-email-wrapper" style="display: none;" >
+	<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
+	<div id="profile-jot-email-end"></div>
+	</div>
 	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
 </div>
 
diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl
index 9a5c581531..7c49d771da 100644
--- a/view/fr/jot.tpl
+++ b/view/fr/jot.tpl
@@ -41,8 +41,13 @@
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
 	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper');" />$bang</div>
 	<div id="profile-jot-perms-end"></div>
+	<div id="profile-jot-email-wrapper" style="display: none;" >
+	<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
+	<div id="profile-jot-email-end"></div>
+	</div>
+
 	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
 </div>
 
diff --git a/view/it/jot.tpl b/view/it/jot.tpl
index b0c90ddf5d..7153c341c7 100644
--- a/view/it/jot.tpl
+++ b/view/it/jot.tpl
@@ -40,8 +40,13 @@
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Attendi" title="Attendi" style="display: none;" />
 	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Impostazione permessi" title="Impostazione permessi" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Impostazione permessi" title="Impostazione permessi" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper');" />$bang</div>
 	<div id="profile-jot-perms-end"></div>
+	<div id="profile-jot-email-wrapper" style="display: none;" >
+	<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
+	<div id="profile-jot-email-end"></div>
+	</div>
+
 	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
 </div>
 

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

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

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 554782a826..63756ce3e6 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";
 		}
 	
 	}

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

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

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 63756ce3e6..269dc3e349 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";
 		}

From 7dbdf8e6faf082e962772b76511f0fd24b6227cc Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 20:52:23 -0800
Subject: [PATCH 13/15] let there be purple! ;-)

---
 view/theme/purplezero/border.jpg | Bin 0 -> 364 bytes
 view/theme/purplezero/head.jpg   | Bin 0 -> 1109 bytes
 view/theme/purplezero/shiny.png  | Bin 0 -> 320 bytes
 view/theme/purplezero/style.css  |  27 +++++++++++++++++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 view/theme/purplezero/border.jpg
 create mode 100644 view/theme/purplezero/head.jpg
 create mode 100644 view/theme/purplezero/shiny.png
 create mode 100644 view/theme/purplezero/style.css

diff --git a/view/theme/purplezero/border.jpg b/view/theme/purplezero/border.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..66c7a6fcc7493b233e78a81f9a97f26fd4133335
GIT binary patch
literal 364
zcmex=<NpH&0WUXCHwH#VMutcrWcdG&LD;z{HL)Z$MWH;iBtya7(>LJ%Z3brsR%R9!
z7G_o;!OF_Y#?HgR4g~z%+?+gu{6a#4{DOkQVlv{wB2uD)f)a`nQnIr0^76vsN-9cn
zDl&5Nav(z(fm+$w*!eg(_~b+cMdU~Z{|_(-axfGyFfubLF)#@-G7B>PKf)jmaz7&j
zGGJk52TDi@FfuTsN-+v03I{F(X#(j%(ZtNe3NlSh5KWwcK~U)bEe0NDMxd3<f(-Ty
zuMS70A6y?j)!#zoLQ&s}Wn7gVD^_JT%}TJc)qG~YrepD{Ou4QMZl_E0iZquoE?WQp
FCIEm^Lx2DP

literal 0
HcmV?d00001

diff --git a/view/theme/purplezero/head.jpg b/view/theme/purplezero/head.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1acd2ddb82f0e040c9dd7a7ef8240bdb26419fff
GIT binary patch
literal 1109
zcmex=<NpH&0WUXCHwH#VMutcrWcdG(X`5?BW*P&7uP=iZ0|NsG5Hm3FF)%SPGOz$y
zj6kfz!~|nAHG!o6Bbx+L161|@HiI(*2OAqZ8!HDpJ3A*Q2N#bBFAq02kED<=zlf}q
zyqv6*jEsVcp1OjPj<Sr5hPkGWfuV_siM+a{t%Z?|p0SA$$Ph+OPEH<f9tmDv2_r=r
zMI(~I{{swy91N@sjLeKm3`~NI%z}*nk1)ss-N_2{H^}Qyz{teR!pg?Z!O6u9RIpWm
zfr*isnTds&m6ZkPb;eqtJOhg$tB|6hBb#twBD+$dh*9Ijg&fLG8xM*GUHqV8oK)1r
z$t5N(At|M*rmmr>WnyY(ZeeNV?BeR??&0Yb91<E99uXOpoRXTBo{^bVTvA$AUQt=q
z+|t_C-qG1LY4Vh*)27duIcw44B}<nrU$Ju4rp;TnZri?N=dMGCj~qRA{KUyqmo8tq
zdhPm+o3|c5di><+v*#~fzWVs-^OvvRzW@073*;|G24;x2;66k1mmttzOe`$SEbJhE
zF*20{F|!~GtD+&BkYgZwVxh2-Q6q<l)5L`v4{|CS2YnDtD!Rxereg9?^&`k@V4o4^
zu_m&72KN}kU$+=|m>GeQ$1KQT&+v`^t>=G+lZ(2vcTckIo98kA|IPpZ7=)dRQWHy3
zQxwWGOEMJPJ$(bfNsyJ91?X3xPgz)5fsxAtN{sCM+}xZzg8V{4g8YJl!eTPw!Xi?l
zf`Sr?5>m3V^78V+;z}w?aw;-%@^auL2-M2X#?HsV!6zpoC?ZEPfF!{h23C|LC<V-S
z48Syn1eh7wnAkah(WoK-%tg$M97wW4j7)-oENr4dp^1e>6DM5)s*(ihho@hVIgHE<
zOf0NGDQQ8l9I_;%Ad`?tAoG9Jz>Ih}i$kn0dnwEFyv8X>MJrnVw7s%gXrJF`$#z9Q
z<BVHvv#FG`iNuMdYYi9F_tb`G{kr*6ddKq{d5=!tC~IflJn7<=LwDKbH@`S|b@u<8
E02JOcQ~&?~

literal 0
HcmV?d00001

diff --git a/view/theme/purplezero/shiny.png b/view/theme/purplezero/shiny.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3f71ee1dbe93c60f0635a1b10c485e99ceab6cb
GIT binary patch
literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=f!a5KFk@|M<S(Egdx@v7EBkFGMiw2hJ$qTQfI<g6T^vI+&d;5w
z$nTga(k6fIE=&E9_lCE(dd_l4=qft=k=Z2DD1DNKq_1$#lA9(6MP|R&+LyHM?t8nJ
zQ=Y%M`&-C8(Y)`Fk)_6wz!^2~GzB_uY4*Q~V6+Xq{dA&i^#bNKuDTzm%8D=G)p61N
zHdVHK0l$yS+lSiL^9~3|h!*RJFo-S?spu+Rpqdr_U6osUfnwJ4_Z<H%7)%4Lmp%2L
zy__rOve`e?`wdnbM7D-cdlvK8H$g4SfBvoG2OO^C?VG)qu~FW6!THDibwIx`c)I$z
JtaD0e0s!EccftSw

literal 0
HcmV?d00001

diff --git a/view/theme/purplezero/style.css b/view/theme/purplezero/style.css
new file mode 100644
index 0000000000..16c9dc6503
--- /dev/null
+++ b/view/theme/purplezero/style.css
@@ -0,0 +1,27 @@
+@import url('../duepuntozero/style.css');
+
+a, a:visited { color: #7433af; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+
+body { 	background-image: url(head.jpg); }
+aside( 	background-image: url(border.jpg); }
+section { 	background-image: url(border.jpg); }
+#profile-tabs-wrapper {	background-image: url(head.jpg); }
+div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
+
+
+.nav-commlink, .nav-login-link {
+	background-color: #aed3b2;
+
+}
+
+.fakelink, .fakelink:visited {
+	color: #7433af;
+}
+
+.wall-item-name-link {
+	color: #7433af;
+}
+
+

From 9d561d4471bccdd199821cd9ce5b2f6354ab8e65 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 23:06:45 -0800
Subject: [PATCH 14/15] oembed contsant name, fix dfrnpubdeliver, add 'code'
 editor button

---
 include/notifier.php   | 130 +++++++++++++++++++++--------------------
 include/oembed.php     |   2 +-
 view/en/jot-header.tpl |   2 +-
 3 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/include/notifier.php b/include/notifier.php
index 87095e814f..8442349cfd 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -159,11 +159,12 @@ function notifier_run($argv, $argc){
 
 		$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
 
-		if( ! count($r)){
-			return;
-		}
+//		if( ! count($r)){
+//			return;
+//		}
 
-		$contacts = $r;
+		if(count($r))
+			$contacts = $r;
 	}
 
 	$feed_template = load_view_file('view/atom_feed.tpl');
@@ -258,87 +259,87 @@ function notifier_run($argv, $argc){
 	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ",
 		dbesc($recip_str)
 	);
-	if(! count($r)){
-		return;
-	}
+
 	// delivery loop
 
 	require_once('include/salmon.php');
 
-	foreach($r as $contact) {
-		if($contact['self'])
-			continue;
+	if(count($r)) {
+		foreach($r as $contact) {
+			if($contact['self'])
+				continue;
 
-		$deliver_status = 0;
+			$deliver_status = 0;
 
-		switch($contact['network']) {
-			case 'dfrn':
-				logger('notifier: dfrndelivery: ' . $contact['name']);
-				$deliver_status = dfrn_deliver($owner,$contact,$atom);
-
-				logger('notifier: dfrn_delivery returns ' . $deliver_status);
-
-				if($deliver_status == (-1)) {
-					logger('notifier: delivery failed: queuing message');
-					// queue message for redelivery
-					q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-						VALUES ( %d, '%s', '%s', '%s') ",
-						intval($contact['id']),
-						dbesc(datetime_convert()),
-						dbesc(datetime_convert()),
-						dbesc($atom)
-					);
-				}
-				break;
-			case 'stat':
-				if($followup && $contact['notify']) {
-					logger('notifier: slapdelivery: ' . $contact['name']);
-					$deliver_status = slapper($owner,$contact['notify'],$slap);
+			switch($contact['network']) {
+				case 'dfrn':
+					logger('notifier: dfrndelivery: ' . $contact['name']);
+					$deliver_status = dfrn_deliver($owner,$contact,$atom);
 
+					logger('notifier: dfrn_delivery returns ' . $deliver_status);
+	
 					if($deliver_status == (-1)) {
+						logger('notifier: delivery failed: queuing message');
 						// queue message for redelivery
 						q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
 							VALUES ( %d, '%s', '%s', '%s') ",
 							intval($contact['id']),
 							dbesc(datetime_convert()),
 							dbesc(datetime_convert()),
-							dbesc($slap)
+							dbesc($atom)
 						);
+					}
+					break;
+				case 'stat':
+					if($followup && $contact['notify']) {
+						logger('notifier: slapdelivery: ' . $contact['name']);
+						$deliver_status = slapper($owner,$contact['notify'],$slap);
+
+						if($deliver_status == (-1)) {
+							// queue message for redelivery
+							q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
+								VALUES ( %d, '%s', '%s', '%s') ",
+								intval($contact['id']),
+								dbesc(datetime_convert()),
+								dbesc(datetime_convert()),
+								dbesc($slap)
+							);
+
+						}
+	
 
 					}
+					else {
 
+						// only send salmon if public - e.g. if it's ok to notify
+						// a public hub, it's ok to send a salmon
 
-				}
-				else {
-
-					// only send salmon if public - e.g. if it's ok to notify
-					// a public hub, it's ok to send a salmon
-
-					if(count($slaps) && $notify_hub) {
-						logger('notifier: slapdelivery: ' . $contact['name']);
-						foreach($slaps as $slappy) {
-							if($contact['notify']) {
-								$deliver_status = slapper($owner,$contact['notify'],$slappy);
-								if($deliver_status == (-1)) {
-									// queue message for redelivery
-									q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-										VALUES ( %d, '%s', '%s', '%s') ",
-										intval($contact['id']),
-										dbesc(datetime_convert()),
-										dbesc(datetime_convert()),
-										dbesc($slappy)
-									);								
+						if(count($slaps) && $notify_hub) {
+							logger('notifier: slapdelivery: ' . $contact['name']);
+							foreach($slaps as $slappy) {
+								if($contact['notify']) {
+									$deliver_status = slapper($owner,$contact['notify'],$slappy);
+									if($deliver_status == (-1)) {
+										// queue message for redelivery
+										q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
+											VALUES ( %d, '%s', '%s', '%s') ",
+											intval($contact['id']),
+											dbesc(datetime_convert()),
+											dbesc(datetime_convert()),
+											dbesc($slappy)
+										);								
+									}
 								}
 							}
 						}
 					}
-				}
-				break;
-			case 'mail':
-			case 'dspr':
-			case 'feed':
-			default:
-				break;
+					break;
+				case 'mail':
+				case 'dspr':
+				case 'feed':
+				default:
+					break;
+			}
 		}
 	}
 		
@@ -382,7 +383,6 @@ function notifier_run($argv, $argc){
 
 		$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. 
@@ -397,7 +397,8 @@ function notifier_run($argv, $argc){
 			intval(REL_FAN)
 		);
 
-		if((count($r)) && ($max_allowed < count($r))) {
+		if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
+
 			foreach($r as $rr) {
 
 				/* Don't deliver to folks who have already been delivered to */
@@ -406,6 +407,7 @@ function notifier_run($argv, $argc){
 					$n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 							intval($rr['id'])
 					);
+
 					if(count($n)) {
 					
 						logger('notifier: dfrnpubdelivery: ' . $n[0]['name']);
diff --git a/include/oembed.php b/include/oembed.php
index a130357abf..37923a877b 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -56,7 +56,7 @@ function oembed_bbcode2html($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);
+	return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", 'oembed_replacecb' ,$text);
 }
 
 
diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index 93eb440a4e..d0c956a020 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -9,7 +9,7 @@ tinyMCE.init({
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
 	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",

From 89313235d26569df5cbdabb1f85871f10056e41f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 23:23:37 -0800
Subject: [PATCH 15/15] it's a bbcode editor, not an html editor

---
 tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js     | 2 +-
 tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
index 69694b1f9f..502b008176 100644
--- a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
+++ b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
@@ -36,7 +36,7 @@ link_desc:"Insert/edit link",
 unlink_desc:"Unlink",
 image_desc:"Insert/edit image",
 cleanup_desc:"Cleanup messy code",
-code_desc:"Edit HTML Source",
+code_desc:"Edit BBcode Source",
 sub_desc:"Subscript",
 sup_desc:"Superscript",
 hr_desc:"Insert horizontal ruler",
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
index 9d124d7db6..ea5a6dae28 100644
--- a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
+++ b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
@@ -10,7 +10,7 @@ about_version:"Version",
 about_loaded:"Loaded plugins",
 anchor_title:"Insert/edit anchor",
 anchor_name:"Anchor name",
-code_title:"HTML Source Editor",
+code_title:"BBcode Source Editor",
 code_wordwrap:"Word wrap",
 colorpicker_title:"Select a color",
 colorpicker_picker_tab:"Picker",