Merge remote branch 'upstream/master'

Conflicts:
	view/theme/vier/style.css

INSTALL.txt

@@ -108,6 +108,11 @@ You can generally find the location of PHP by executing "which php". If you
 have troubles with this section please contact your hosting provider for 
 assistance. Friendika will not work correctly if you cannot perform this step.
 
+You should also be sure that $a->config['php_path'] is set correctly, it should
+look like (changing it to the correct PHP location)
+
+$a->config['php_path'] = '/usr/local/php53/bin/php'
+  
 Alternative: You may be able to use the 'poormancron' plugin to perform this
 step if you are using a recent Friendika release. 'poormancron' may result in
 perfomance and memory issues and is only suitable for small sites with one or

boot.php

@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1237' );
+define ( 'FRIENDICA_VERSION',      '2.3.1255' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1118      );
+define ( 'DB_UPDATE_VERSION',      1122      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -101,10 +101,12 @@ define ( 'NETWORK_OSTATUS',          'stat');    // status.net, identi.ca, GNU-s
 define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known "post/notify" protocol
 define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
 define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
+define ( 'NETWORK_MAIL2',            'mai2');    // extended IMAP/POP
 define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API     
 define ( 'NETWORK_LINKEDIN',         'lnkd');    // LinkedIn
 define ( 'NETWORK_XMPP',             'xmpp');    // XMPP     
 define ( 'NETWORK_MYSPACE',          'mysp');    // MySpace
+define ( 'NETWORK_GPLUS',            'goog');    // Google+
 
 /**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
@@ -130,7 +132,8 @@ define ( 'NOTIFY_COMMENT', 0x0008 );
 define ( 'NOTIFY_MAIL',     0x0010 );
 define ( 'NOTIFY_SUGGEST',  0x0020 );
 define ( 'NOTIFY_PROFILE',  0x0040 );
-
+define ( 'NOTIFY_TAGSELF',  0x0080 );
+define ( 'NOTIFY_TAGSHARE', 0x0100 );
 
 /**
  * various namespaces we may need to parse
@@ -826,7 +829,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
 			intval($profile_int)
 		);
 	}
-	if(! count($r)) {	
+	if((! $r) && (!  count($r))) {	
 		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` 
 			left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
 			WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
@@ -840,6 +843,16 @@ function profile_load(&$a, $nickname, $profile = 0) {
 		return;
 	}
 	
+	// fetch user tags if this isn't the default profile
+
+	if(! $r[0]['is-default']) {
+		$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
+			intval($profile_uid)
+		);
+		if($x && count($x))
+			$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
+	}
+
 	$a->profile = $r[0];
 
 

database.sql

@@ -96,6 +96,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `pending` tinyint(1) NOT NULL DEFAULT '1',
   `rating` tinyint(1) NOT NULL DEFAULT '0',
   `reason` text NOT NULL,
+  `closeness` tinyint(2) NOT NULL DEFAULT '99',
   `info` mediumtext NOT NULL,
   `profile-id` int(11) NOT NULL DEFAULT '0',
   `bdyear` CHAR( 4 ) NOT NULL COMMENT 'birthday notify flag',
@@ -116,7 +117,8 @@ CREATE TABLE IF NOT EXISTS `contact` (
   KEY `blocked` (`blocked`),
   KEY `readonly` (`readonly`),
   KEY `hidden` (`hidden`),
-  KEY `pending` (`pending`)  
+  KEY `pending` (`pending`),
+  KEY `closeness` (`closeness`)  
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -224,6 +226,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `pubmail` tinyint(1) NOT NULL DEFAULT '0',
   `moderated` tinyint(1) NOT NULL DEFAULT '0',
   `visible` tinyint(1) NOT NULL DEFAULT '0',
+  `spam` tinyint(1) NOT NULL DEFAULT '0',
   `starred` tinyint(1) NOT NULL DEFAULT '0',
   `bookmark` tinyint(1) NOT NULL DEFAULT '0',
   `unseen` tinyint(1) NOT NULL DEFAULT '1',
@@ -245,6 +248,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `received` (`received`),
   KEY `moderated` (`moderated`),
   KEY `visible` (`visible`),
+  KEY `spam` (`spam`),
   KEY `starred` (`starred`),
   KEY `bookmark` (`bookmark`),
   KEY `deleted` (`deleted`),
@@ -777,3 +781,31 @@ INDEX ( `uid` ),
 INDEX ( `mid` )
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `poll_result` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`poll_id` INT NOT NULL ,
+`choice` INT NOT NULL ,
+INDEX ( `poll_id` ),
+INDEX ( `choice` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `poll` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`uid` INT NOT NULL ,
+`q0` MEDIUMTEXT NOT NULL ,
+`q1` MEDIUMTEXT NOT NULL ,
+`q2` MEDIUMTEXT NOT NULL ,
+`q3` MEDIUMTEXT NOT NULL ,
+`q4` MEDIUMTEXT NOT NULL ,
+`q5` MEDIUMTEXT NOT NULL ,
+`q6` MEDIUMTEXT NOT NULL ,
+`q7` MEDIUMTEXT NOT NULL ,
+`q8` MEDIUMTEXT NOT NULL ,
+`q9` MEDIUMTEXT NOT NULL ,
+INDEX ( `uid` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
+
+
+

doc/Pages.md

@@ -24,7 +24,7 @@ The "Automatic Friend Account" is typically used for personal profile pages wher
 
 We recommend that you create group pages with the same email address and password as your normal account. If you do this, you will find a new "Manage" tab on the menu bar which lets you toggle identities easily and manage your pages. You are not required to do this, but the alternative is to logout and log back into the other account to manage alternate pages - and this could get cumbersome if you manage several different pages/identities. 
 
-You may also appoint a delegate to manage your page. Do this by visiting the [Delegation Setup Page](/delegate). This will provide you with a list of contacts on this system under "Potential Delegates". Selecting one or more persons will give them access to manage your page. They will be able to edit contacts, profiles, and all content for this account/page. Please use this facility wisely. Delegated managers will not be able to alter basic account settings such as passwords or page types and/or remove the account.  
+You may also appoint a delegate to manage your page. Do this by visiting the [Delegation Setup Page](delegate). This will provide you with a list of contacts on this system under "Potential Delegates". Selecting one or more persons will give them access to manage your page. They will be able to edit contacts, profiles, and all content for this account/page. Please use this facility wisely. Delegated managers will not be able to alter basic account settings such as passwords or page types and/or remove the account.
 
 
 **Posting to Community Pages**

doc/Plugins.md

@@ -1,11 +1,20 @@
 **Friendica Addon/Plugin development**
 
-This is an early specification and hook details may be subject to change.
-
 Please see the sample addon 'randplace' for a working example of using some of these features. The facebook addon provides an example of integrating both "addon" and "module" functionality. Addons work by intercepting event hooks - which must be registered. Modules work by intercepting specific page requests (by URL path). 
 
 
-Plugin names cannot contain spaces and are used as filenames. Each addon must contain both an install and an uninstall function based on the addon/plugin name. For instance "plugin1name_install()". These two functions take no arguments and are usually responsible for registering (and unregistering) event hooks that your plugin will require. The install and uninstall functions will also be called (i.e. re-installed) if the plugin changes after installation - therefore your uninstall should not destroy data and install should consider that data may already exist. Future extensions may provide for "setup" amd "remove". 
+Plugin names cannot contain spaces or other punctuation and are used as filenames and function names. You may supply a "friendly" name within the comment block. Each addon must contain both an install and an uninstall function based on the addon/plugin name. For instance "plugin1name_install()". These two functions take no arguments and are usually responsible for registering (and unregistering) event hooks that your plugin will require. The install and uninstall functions will also be called (i.e. re-installed) if the plugin changes after installation - therefore your uninstall should not destroy data and install should consider that data may already exist. Future extensions may provide for "setup" amd "remove". 
+
+Plugins should contain a comment block with the four following parameters: 
+
+	/*
+	* Name: My Great Plugin 
+ 	* Description: This is what my plugin does. It's really cool
+ 	* Version: 1.0
+ 	* Author: John Q. Public <john@myfriendicasite.com>
+	*/
+
+
 
 
 Register your plugin hooks during installation.
@@ -160,7 +169,8 @@ Your module functions will often contain the function plugin_name_content(&$a),
     $b is (string) HTML of content div
 
 
-A complete list of all hook callbacks with file locations (generated 09-Nov-2011): Please see the source for details of any hooks not documented above.
+A complete list of all hook callbacks with file locations (generated 14-Feb-2012): Please see the source for details of any hooks not documented above.
+
 
 boot.php:	call_hooks('login_hook',$o);
 
@@ -170,7 +180,7 @@ boot.php:	call_hooks('profile_sidebar', $arr);
 
 boot.php:	call_hooks("proc_run", $arr);
 
-include/contact_selectors.php:	call_hooks('network_to_name', $s);
+include/contact_selectors.php:	call_hooks('network_to_name', $nets);
 
 include/api.php:				call_hooks('logged_in', $a->user);
 
@@ -194,8 +204,6 @@ include/nav.php:	call_hooks('page_header', $a->page['nav']);
 
 include/auth.php:		call_hooks('authenticate', $addon_auth);
 
-include/auth.php:		call_hooks('logged_in', $a->user);
-
 include/bbcode.php:	call_hooks('bbcode',$Text);
 
 include/oauth.php:		call_hooks('logged_in', $a->user);		
@@ -236,12 +244,22 @@ include/bb2diaspora.php:	call_hooks('bb2diaspora',$Text);
 
 include/cronhooks.php:	call_hooks('cron', $d);
 
+include/security.php:		call_hooks('logged_in', $a->user);
+
 include/html2bbcode.php:	call_hooks('html2bbcode', $text);
 
+include/Contact.php:	call_hooks('remove_user',$r[0]);
+
 include/Contact.php:	call_hooks('contact_photo_menu', $args);
 
+include/conversation.php:	call_hooks('conversation_start',$cb);
+
+include/conversation.php:				call_hooks('render_location',$locate);
+
 include/conversation.php:				call_hooks('display_item', $arr);
 
+include/conversation.php:				call_hooks('render_location',$locate);
+
 include/conversation.php:				call_hooks('display_item', $arr);
 
 include/conversation.php:	call_hooks('item_photo_menu', $args);
@@ -282,6 +300,8 @@ mod/editpost.php:	call_hooks('jot_networks', $jotnets);
 
 mod/parse_url.php:	call_hooks('parse_link', $arr);
 
+mod/home.php:	call_hooks('home_init',$ret);
+
 mod/home.php:	call_hooks("home_content",$o);
 
 mod/contacts.php:	call_hooks('contact_edit_post', $_POST);
@@ -306,7 +326,7 @@ mod/like.php:	call_hooks('post_local_end', $arr);
 
 mod/xrd.php:	call_hooks('personal_xrd', $arr);
 
-mod/item.php:	call_hooks('post_local_start', $_POST);
+mod/item.php:	call_hooks('post_local_start', $_REQUEST);
 
 mod/item.php:	call_hooks('post_local',$datarray);
 

doc/developer

@@ -1,18 +0,0 @@
-Friendica Developer Guide
-
-Here is how you can join us.
-
-First, get yourself a working git package on the system where you will be
-doing development.
-
-Create your own github account.
-
-Follow the instructions provided here: [[http://help.github.com/fork-a-repo/]]
-to create and use your own tracking fork on github
-
-Then go to your github page and create a "Pull request" when you are ready
-to notify us to merge your work.
-
-**Important**
-
-Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.   

images/icons/Makefile

@@ -2,7 +2,8 @@
 IMAGES=add.png edit.png	gear.png info.png menu.png \
 		notify_off.png star.png  delete.png feed.png group.png \
 		lock.png notice.png notify_on.png user.png link.png \
-		play.png plugin.png unlock.png
+		play.png plugin.png unlock.png zip.png audio.png video.png \
+		image.png text.png
 
 DESTS=10/ 16/ 22/ 48/ \
 		$(addprefix 10/, $(IMAGES)) \

include/attach.php

@@ -38,6 +38,7 @@ function z_mime_content_type($filename) {
 
 		// audio/video
 		'mp3' => 'audio/mpeg',
+		'wav' => 'audio/wav',
 		'qt' => 'video/quicktime',
 		'mov' => 'video/quicktime',
 		'ogg' => 'application/ogg',
@@ -68,12 +69,13 @@ function z_mime_content_type($filename) {
 			return $mime_types[$ext];
 		}
 	}
-	elseif (function_exists('finfo_open')) {
-		$finfo = finfo_open(FILEINFO_MIME);
-		$mimetype = finfo_file($finfo, $filename);
-		finfo_close($finfo);
-		return $mimetype;
-	}
+// can't use this because we're just passing a name, e.g. not a file that can be opened
+//	elseif (function_exists('finfo_open')) {
+//		$finfo = @finfo_open(FILEINFO_MIME);
+//		$mimetype = @finfo_file($finfo, $filename);
+//		@finfo_close($finfo);
+//		return $mimetype;
+//	}
 	else {
 		return 'application/octet-stream';
 	}

include/auth.php

@@ -165,7 +165,7 @@ else {
 		}
 
 		if((! $record) || (! count($record))) {
-			logger('authenticate: failed login attempt: ' . trim($_POST['username'])); 
+			logger('authenticate: failed login attempt: ' . notags(trim($_POST['username']))); 
 			notice( t('Login failed.') . EOL );
 			goaway(z_root());
   		}

include/bb2diaspora.php

@@ -14,9 +14,17 @@ require_once('include/html2bbcode.php');
 function diaspora2bb($s) {
 
 	$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
+    $s = str_replace("\r","\n",$s);
 
 	$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
+
+    $s = preg_replace('/\#([^\s\#])/','\\#$1',$s);
+
 	$s = Markdown($s);
+
+    $s = str_replace('#','#',$s);
+    $s = str_replace("\n",'<br />',$s);
+
 	$s = html2bbcode($s);
 //	$s = str_replace('&#42;','*',$s);
 
@@ -30,11 +38,6 @@ function diaspora2bb($s) {
 	$s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
 	$s = scale_diaspora_images($s);
 
-	// we seem to get a lot of text smushed together with links from Diaspora.
-
-	$s = preg_replace('/[^ ]\[url\=(.*?)\]/',' [url=$1]' ,$s);
-	$s = preg_replace('/\[\/url\][^ ]/','[/url] ',$s);
-
 	return $s;
 }
 
@@ -209,7 +212,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 	$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text);
 
 
-
+	$Text = str_replace('[nosmile]','',$Text);
 
 	// oembed tag
 	//	$Text = oembed_bbcode2html($Text);

include/bbcode.php

@@ -11,7 +11,7 @@ function stripcode_br_cb($s) {
 
 function tryoembed($match){
 	$url = ((count($match)==2)?$match[1]:$match[2]);
-	logger("tryoembed: $url");
+//	logger("tryoembed: $url");
 	
 	$o = oembed_fetch_url($url);
 
@@ -24,13 +24,40 @@ function tryoembed($match){
 	
 }
 
+// [noparse][i]italic[/i][/noparse] turns into 
+// [noparse][ i ]italic[ /i ][/noparse], 
+// to hide them from parser.
 
+function bb_spacefy($st) {
+  $whole_match = $st[0];
+  $captured = $st[1];
+  $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured);
+  $new_str = str_replace($captured, $spacefied, $whole_match);
+  return $new_str;
+}
+
+// The previously spacefied [noparse][ i ]italic[ /i ][/noparse], 
+// now turns back and the [noparse] tags are trimed
+// returning [i]italic[/i]
+
+function bb_unspacefy_and_trim($st) {
+  $whole_match = $st[0];
+  $captured = $st[1];
+  $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured);
+  return $unspacefied;
+}
 
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendica - Mike Macgirvin
 
 function bbcode($Text,$preserve_nl = false) {
 
+	// Hide all [noparse] contained bbtags spacefying them
+
+	$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
+	$Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy',$Text);
+	$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
+
 
 	// Extract a single private image which uses data url's since preg has issues with 
 	// large data sizes. Stash it away while we do bbcode conversion, and then put it back 
@@ -111,25 +138,34 @@ function bbcode($Text,$preserve_nl = false) {
 	$Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism","<span style=\"color: $1;\">$2</span>",$Text);
 
 	// Check for sized text
+        // [size=50] --> font-size: 50px (with the unit).
+	$Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px;\">$2</span>",$Text);
 	$Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1;\">$2</span>",$Text);
 
+	// Check for centered text
+	$Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text);
+
 	// Check for list text
-
-	if(stristr($Text,'[/list]'))
-		$Text = str_replace("[*]", "<li>", $Text);
-
-	if(stristr($Text,'[/list]'))
 	$Text = str_replace("[*]", "<li>", $Text);
+	$Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>' ,$Text);
 
 	$Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text);
+	$Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' 
+,$Text);
 	$Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text);
 	$Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text);
-	$Text = preg_replace("/\[list=i\](.*?)\[\/list\]/sm",'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>' ,$Text);
-	$Text = preg_replace("/\[list=I\](.*?)\[\/list\]/sm", '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>' ,$Text);
-	$Text = preg_replace("/\[list=a\](.*?)\[\/list\]/sm", '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>' ,$Text);
-	$Text = preg_replace("/\[list=A\](.*?)\[\/list\]/sm", '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>' ,$Text);
-	$Text = preg_replace("/\[li\](.*?)\[\/li\]/sm", '<li>$1</li>' ,$Text);
+	$Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' 
+,$Text);
+	$Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism",'<ul class="listlowerroman" style="list-style-type: 
+lower-roman;">$2</ul>' ,$Text);
+	$Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '<ul class="listupperroman" style="list-style-type: 
+upper-roman;">$2</ul>' ,$Text);
+	$Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '<ul class="listloweralpha" style="list-style-type: 
+lower-alpha;">$2</ul>' ,$Text);
+	$Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '<ul class="listupperalpha" style="list-style-type: 
+upper-alpha;">$2</ul>' ,$Text);
 
+	$Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>' ,$Text);
 	$Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '<td>$1</td>' ,$Text);
 	$Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '<tr>$1</tr>' ,$Text);
 	$Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '<table>$1</table>' ,$Text);
@@ -137,7 +173,11 @@ function bbcode($Text,$preserve_nl = false) {
 	$Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '<table border="1" >$1</table>' ,$Text);
 	$Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>' ,$Text);
 
+	$Text = str_replace('[hr]','<hr />', $Text);
 
+	// This is actually executed in prepare_body()
+
+	$Text = str_replace('[nosmile]','',$Text);
 
 	// Check for font change text
 	$Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm","<span style=\"font-family: $1;\">$2</span>",$Text);
@@ -158,6 +198,14 @@ function bbcode($Text,$preserve_nl = false) {
 	// Check for [quote] text
 	$Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text);
 
+	// Check for [quote=Author] text
+
+	$t_wrote = t('$1 wrote:');
+
+	$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", 
+                             "<blockquote><strong>" . $t_wrote . "</strong> $2</blockquote>", 
+                             $Text);         
+
 	// [img=widthxheight]image source[/img]
 	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
 
@@ -219,6 +267,13 @@ function bbcode($Text,$preserve_nl = false) {
 		$Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text);
 	}
 
+	// Unhide all [noparse] contained bbtags unspacefying them 
+	// and triming the [noparse] tag.
+
+	$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim',$Text);
+	$Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text);
+	$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text);
+
 	// fix any escaped ampersands that may have been converted into links
 	$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
 	if(strlen($saved_image))

include/conversation.php

@@ -4,6 +4,28 @@
  * Render actions localized
  */
 function localize_item(&$item){
+
+	$Text = $item['body'];
+	$saved_image = '';
+	$img_start = strpos($Text,'[img]data:');
+	$img_end = strpos($Text,'[/img]');
+
+	if($img_start !== false && $img_end !== false && $img_end > $img_start) {
+		$start_fragment = substr($Text,0,$img_start);
+		$img_start += strlen('[img]');
+		$saved_image = substr($Text,$img_start,$img_end - $img_start);
+		$end_fragment = substr($Text,$img_end + strlen('[/img]'));		
+		$Text = $start_fragment . '[!#saved_image#!]' . $end_fragment;
+		$search = '/\[url\=(.*?)\]\[!#saved_image#!\]\[\/url\]' . '/is';
+		$replace = '[url=' . z_path() . '/redir/' . $item['contact-id'] 
+			. '?f=1&url=' . '$1' . '][!#saved_image#!][/url]' ;
+
+		$Text = preg_replace($search,$replace,$Text);
+
+		if(strlen($saved_image))
+			$item['body'] = str_replace('[!#saved_image#!]', '[img]' . $saved_image . '[/img]',$Text);
+	}
+
 	$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
 	if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
 
@@ -262,15 +284,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				else
 					$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
 
-				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-				if($coord) {
-					if($location)
-						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-					else
-						$location = '<span class="smalltext">' . $coord . '</span>';
-				}
+				$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+				call_hooks('render_location',$locate);
 
+				$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
 				localize_item($item);
 				if($mode === 'network-new')
@@ -494,7 +511,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				}
 
 				$likebuttons = '';
-				$shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
+				$shareable = ((($profile_owner == local_user()) &&  (! $item['private'])) ? true : false); //($mode != 'display') &&
 
 				if($page_writeable) {
 					if($toplevelpost) {
@@ -505,6 +522,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
 					}
 
+
+					$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+					$qcomment = (($qc) ? explode("\n",$qc) : null);
+
 					if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
 						$comment = replace_macros($cmnt_tpl,array(
 							'$return_path' => '', 
@@ -512,6 +533,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 							'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
 							'$id' => $item['item_id'],
 							'$parent' => $item['parent'],
+							'$qcomment' => $qcomment,
 							'$profile_uid' =>  $profile_owner,
 							'$mylink' => $a->contact['url'],
 							'$mytitle' => t('This is you'),
@@ -594,16 +616,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 				$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
-				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] 
-					. '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] 
-					. '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-				if($coord) {
-					if($location)
-						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-					else
-						$location = '<span class="smalltext">' . $coord . '</span>';
-				}
+				$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+				call_hooks('render_location',$locate);
+
+				$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
 				$indent = (($toplevelpost) ? '' : ' comment');
 
@@ -620,12 +636,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					if ($tag!="") $tags[] = bbcode($tag);
 				}
 
-
 				// Build the HTML
 
 				$body = prepare_body($item,true);
 
-
 				$tmp_item = replace_macros($template,array(
 					'$type' => implode("",array_slice(split("/",$item['verb']),-1)),
 					'$tags' => $tags,
@@ -832,17 +846,22 @@ function format_like($cnt,$arr,$type,$id) {
 }}
 
 
-function status_editor($a,$x, $notes_cid = 0) {
+function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
 	$o = '';
 		
 	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
+	$plaintext = false;
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+		$plaintext = true;
+
 	$tpl = get_markup_template('jot-header.tpl');
 	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
 		'$baseurl' => $a->get_baseurl(),
+		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$geotag' => $geotag,
 		'$nickname' => $x['nickname'],
 		'$ispublic' => t('Visible to <strong>everybody</strong>'),
@@ -878,8 +897,7 @@ function status_editor($a,$x, $notes_cid = 0) {
 
 	if($mail_enabled) {
 		$selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-			$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
-           	. t("Post to Email") . '</div>';
+		$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
 	}
 
 	call_hooks('jot_tool', $jotplugins);
@@ -892,7 +910,7 @@ function status_editor($a,$x, $notes_cid = 0) {
 
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $a->cmd,
-			'$action' => 'item',
+		'$action' =>  $a->get_baseurl().'/item',
 		'$share' => (($x['button']) ? $x['button'] : t('Share')),
 		'$upload' => t('Upload photo'),
 		'$shortupload' => t('upload photo'),
@@ -931,6 +949,12 @@ function status_editor($a,$x, $notes_cid = 0) {
 		'$preview' => t('Preview'),
 	));
 
+
+	if ($popup==true){
+		$o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
+		
+	}
+
 	return $o;
 }
 
@@ -1004,3 +1028,17 @@ function find_thread_parent_index($arr,$x) {
 			return $k;
 	return false;
 }
+
+function render_location_google($item) {
+	$location = '';
+	$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+	$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+	if($coord) {
+		if($location)
+			$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+		else
+			$location = '<span class="smalltext">' . $coord . '</span>';
+	}
+	return $location;
+}
+

include/datetime.php

@@ -263,7 +263,8 @@ function relative_date($posted_date) {
 		$d = $etime / $secs;
 		if ($d >= 1) {
 			$r = round($d);
-		return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago');
+			// translators - e.g. 22 hours ago, 1 minute ago
+			return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1]));
         }
     }
 }}

include/delivery.php

@@ -21,6 +21,7 @@ function delivery_run($argv, $argc){
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 	require_once('include/diaspora.php');
+	require_once('include/email.php');
 
 	load_config('config');
 	load_config('system');
@@ -311,6 +312,13 @@ function delivery_run($argv, $argc){
 				);
 
 				if(count($x)) {
+					if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
+						q("update contact set writable = 1 where id = %d limit 1",
+							intval($x[0]['id'])
+						);
+						$x[0]['writable'] = 1;
+					}
+
 					require_once('library/simplepie/simplepie.inc');
 					logger('mod-delivery: local delivery');
 					local_delivery($x[0],$atom);
@@ -373,6 +381,7 @@ function delivery_run($argv, $argc){
 			break;
 
 		case NETWORK_MAIL :
+		case NETWORK_MAIL2:
 				
 			if(get_config('system','dfrn_only'))
 				break;
@@ -412,8 +421,15 @@ function delivery_run($argv, $argc){
 				if($r1 && $r1[0]['reply_to'])
 					$reply_to = $r1[0]['reply_to'];
 
-				$subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
-				$headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+				$subject  = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
+
+				// only expose our real email address to true friends
+
+				if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
+					$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
+				else
+					$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+
 				if($reply_to)
 					$headers .= 'Reply-to: ' . $reply_to . "\n";
 				$headers .= 'Message-id: <' . $it['uri'] . '>' . "\n";

include/diaspora.php

@@ -598,7 +598,7 @@ function diaspora_request($importer,$xml) {
 			`uri-date` = '%s', 
 			`avatar-date` = '%s', 
 			`blocked` = 0, 
-			`pending` = 0,
+			`pending` = 0
 			WHERE `id` = %d LIMIT 1
 			",
 			dbesc($photos[0]),
@@ -611,7 +611,7 @@ function diaspora_request($importer,$xml) {
 			intval($contact_record['id'])
 		);
 
-		$u = q("select * from user where id = %d limit 1",intval($importer['uid']));
+		$u = q("select * from user where uid = %d limit 1",intval($importer['uid']));
 		if($u)
 			$ret = diaspora_share($u[0],$contact_record);
 	}
@@ -673,6 +673,14 @@ function diaspora_post($importer,$xml) {
 			if(strpos($tag,'#') === 0) {
 				if(strpos($tag,'[url='))
 					continue;
+
+				// don't link tags that are already embedded in links
+
+				if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body))
+					continue;
+				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body))
+					continue;
+
 				$basetag = str_replace('_',' ',substr($tag,1));
 				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
 				if(strlen($str_tags))
@@ -830,6 +838,15 @@ function diaspora_reshare($importer,$xml) {
 			if(strpos($tag,'#') === 0) {
 				if(strpos($tag,'[url='))
 					continue;
+
+				// don't link tags that are already embedded in links
+
+				if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body))
+					continue;
+				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body))
+					continue;
+
+
 				$basetag = str_replace('_',' ',substr($tag,1));
 				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
 				if(strlen($str_tags))
@@ -1062,6 +1079,15 @@ function diaspora_comment($importer,$xml,$msg) {
 			if(strpos($tag,'#') === 0) {
 				if(strpos($tag,'[url='))
 					continue;
+
+				// don't link tags that are already embedded in links
+
+				if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body))
+					continue;
+				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body))
+					continue;
+
+
 				$basetag = str_replace('_',' ',substr($tag,1));
 				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
 				if(strlen($str_tags))
@@ -1282,6 +1308,7 @@ function diaspora_conversation($importer,$xml,$msg) {
 			'language' => $importer['language'],
 			'to_name' => $importer['username'],
 			'to_email' => $importer['email'],
+			'uid' =>$importer['importer_uid'],
 			'item' => array('subject' => $subject, 'body' => $body),
 			'source_name' => $person['name'],
 			'source_link' => $person['url'],

include/enotify.php

@@ -28,17 +28,19 @@ function notification($params) {
 		$subject = 	sprintf( t('New mail received at %s'),$sitename);
 
 		$preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
-
+		$epreamble = sprintf( t('%s sent you a private message.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]');
 		$sitelink = t('Please visit %s to view and/or reply to your private messages.');
 		$tsitelink = sprintf( $sitelink, $siteurl . '/message' );
 		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message">' . $sitename . '</a>');
-		$itemlink = '';
+		$itemlink = $siteurl . '/message';
 	}
 
 	if($params['type'] == NOTIFY_COMMENT) {
 
 		$subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename);
 		$preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); 
+		$epreamble = sprintf( t('%s commented on an item/conversation you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
 		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
@@ -47,6 +49,27 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_WALL) {
 		$preamble = $subject =	sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename);
+		$epreamble = sprintf( t('%s posted to your profile wall') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+		
+		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
+		$tsitelink = sprintf( $sitelink, $siteurl );
+		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
+		$itemlink =  $params['link'];
+	}
+
+	if($params['type'] == NOTIFY_TAGSELF) {
+		$preamble = $subject =	sprintf( t('%s tagged you at %s') , $params['source_name'], $sitename);
+		$epreamble = sprintf( t('%s tagged you') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+
+		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
+		$tsitelink = sprintf( $sitelink, $siteurl );
+		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
+		$itemlink =  $params['link'];
+	}
+
+	if($params['type'] == NOTIFY_TAGSHARE) {
+		$preamble = $subject =	sprintf( t('%s tagged your post at %s') , $params['source_name'], $sitename);
+		$epreamble = sprintf( t('%s tagged your post') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
@@ -57,6 +80,7 @@ function notification($params) {
 	if($params['type'] == NOTIFY_INTRO) {
 		$subject = sprintf( t('Introduction received at %s'), $sitename);
 		$preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); 
+		$epreamble = sprintf( t('You\'ve received an introduction from %s'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
 		$body = sprintf( t('You may visit their profile at %s'),$params['source_link']);
 
 		$sitelink = t('Please visit %s to approve or reject the introduction.');
@@ -68,6 +92,9 @@ function notification($params) {
 	if($params['type'] == NOTIFY_SUGGEST) {
 		$subject = sprintf( t('Friend suggestion received at %s'), $sitename);
 		$preamble = sprintf( t('You\'ve received a friend suggestion from \'%s\' at %s'), $params['source_name'], $sitename); 
+		$epreamble = sprintf( t('You\'ve received a friend suggestion for %s from %s'),
+			'[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]', 
+			'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
 		$body = t('Name:') . ' ' . $params['item']['name'] . "\n";
 		$body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n";
 		$body .= sprintf( t('You may visit their profile at %s'),$params['item']['url']);
@@ -82,9 +109,27 @@ function notification($params) {
 
 	}
 
-	// TODO - create notification entry in DB
+	// from here on everything is in the recipients language
 
+	push_lang($params['language']);
 
+	require_once('include/html2bbcode.php');	
+
+	// create notification entry in DB
+
+	$r = q("insert into notify (name,url,photo,date,msg,uid,link,type,verb,otype)
+		values('%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')",
+		dbesc($params['source_name']),
+		dbesc($params['source_link']),
+		dbesc($params['source_photo']),
+		dbesc(datetime_convert()),
+		dbesc($epreamble),
+		intval($params['uid']),
+		dbesc($itemlink),
+		intval($params['type']),
+		dbesc($params['verb']),
+		dbesc($params['otype'])
+	);
 
 	// send email notification if notification preferences permit
 
@@ -93,7 +138,6 @@ function notification($params) {
 
 		logger('notification: sending notification email');
 
-		push_lang($params['language']);
 
 		$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
 			$body))),ENT_QUOTES,'UTF-8'));
@@ -108,7 +152,7 @@ function notification($params) {
 			'$preamble'     => $preamble,
 			'$sitename'     => $sitename,
 			'$siteurl'      => $siteurl,
-			'$source_name'  => $parama['source_name'],
+			'$source_name'  => $params['source_name'],
 			'$source_link'  => $params['source_link'],
 			'$source_photo' => $params['source_photo'],
 			'$username'     => $params['to_name'],
@@ -128,7 +172,7 @@ function notification($params) {
 			'$preamble'     => $preamble,
 			'$sitename'     => $sitename,
 			'$siteurl'      => $siteurl,
-			'$source_name'  => $parama['source_name'],
+			'$source_name'  => $params['source_name'],
 			'$source_link'  => $params['source_link'],
 			'$source_photo' => $params['source_photo'],
 			'$username'     => $params['to_name'],
@@ -153,8 +197,10 @@ function notification($params) {
 			'htmlVersion' => $email_html_body,
 			'textVersion' => $email_text_body
 		));
-		pop_lang();
 	}
+
+	pop_lang();
+
 }
 
 require_once('include/email.php');

include/expire.php

@@ -29,6 +29,11 @@ function expire_run($argv, $argc){
 	$a->set_baseurl(get_config('system','url'));
 
 
+	// physically remove anything that has been deleted for more than two months
+
+	$r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+	q("optimize table item");
+
 	logger('expire: start');
 	
 	$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");

include/items.php

@@ -814,6 +814,11 @@ function item_store($arr,$force_parent = false) {
 
 	call_hooks('post_remote',$arr);
 
+	if(x($arr,'cancel')) {
+		logger('item_store: post cancelled by plugin.');
+		return 0;
+	}
+
 	dbesc_array($arr);
 
 	logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
@@ -900,7 +905,7 @@ function item_store($arr,$force_parent = false) {
 		);
 	}
 
-	tgroup_deliver($arr['uid'],$current_post);
+	tag_deliver($arr['uid'],$current_post);
 
 	return $current_post;
 }
@@ -918,22 +923,22 @@ function get_item_contact($item,$contacts) {
 }
 
 
-function tgroup_deliver($uid,$item_id) {
+function tag_deliver($uid,$item_id) {
 
-
-	// setup a second delivery chain for forum/community posts if appropriate
+	// look for mention tags and setup a second delivery chain for forum/community posts if appropriate
 
 	$a = get_app();
 
-	$deliver_to_tgroup = false;
+	$mention = false;
 
-	$u = q("select * from user where uid = %d and `page-flags` = %d limit 1",
-		intval($uid),
-		intval(PAGE_COMMUNITY)
+	$u = q("select uid, nickname, language, username, email, `page-flags`, `notify-flags` from user where uid = %d limit 1",
+		intval($uid)
 	);
 	if(! count($u))
 		return;
 
+	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+
 	$i = q("select * from item where id = %d and uid = %d limit 1",
 		intval($item_id),
 		intval($uid)
@@ -943,13 +948,6 @@ function tgroup_deliver($uid,$item_id) {
 
 	$item = $i[0];
 
-	// prevent delivery looping - only proceed
-	// if the message originated elsewhere and is a top-level post
-
-	if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
-		return;
-
-
 	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
 
 	// Diaspora uses their own hardwired link URL in @-tags
@@ -961,19 +959,57 @@ function tgroup_deliver($uid,$item_id) {
 	if($cnt) {
 		foreach($matches as $mtch) {
 			if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
-				$deliver_to_tgroup = true;
-				logger('tgroup_deliver: local group mention found: ' . $mtch[2]);
+				$mention = true;
+				logger('tag_deliver: mention found: ' . $mtch[2]);
 			}
 		}
 	}
 
-	if(! $deliver_to_tgroup)
+	if(! $mention)
+		return;
+
+	// send a notification
+
+	require_once('include/enotify.php');
+	notification(array(
+		'type'         => NOTIFY_TAGSELF,
+		'notify_flags' => $u[0]['notify-flags'],
+		'language'     => $u[0]['language'],
+		'to_name'      => $u[0]['username'],
+		'to_email'     => $u[0]['email'],
+		'uid'          => $u[0]['uid'],
+		'item'         => $item,
+		'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
+		'source_name'  => $item['author-name'],
+		'source_link'  => $item['author-link'],
+		'source_photo' => $item['author-avatar'],
+		'verb'         => ACTIVITY_TAG,
+		'otype'        => 'item'
+	));
+
+	if(! $community_page)
+		return;
+
+	// tgroup delivery - setup a second delivery chain
+	// prevent delivery looping - only proceed
+	// if the message originated elsewhere and is a top-level post
+
+	if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
 		return;
 
 	// now change this copy of the post to a forum head message and deliver to all the tgroup members
 
 
-	q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1",
+	$c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1",
+		intval($u[0]['uid'])
+	);
+	if(! count($c))
+		return;
+
+	q("update item set wall = 1, origin = 1, forum_mode = 1, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s'  where id = %d limit 1",
+		dbesc($c[0]['name']),
+		dbesc($c[0]['url']),
+		dbesc($c[0]['thumb']),
 		intval($item_id)
 	);
 
@@ -990,8 +1026,8 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$a = get_app();
 
-	if((! strlen($contact['issued-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
-		return 3;
+//	if((! strlen($contact['issued-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
+//		return 3;
 
 	$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
@@ -1042,7 +1078,9 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	$final_dfrn_id = '';
 
 
-	if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+	if(($contact['duplex'] && strlen($contact['pubkey'])) 
+		|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+		|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
 		openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
 		openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
 	}
@@ -1085,7 +1123,10 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 
 		if($dfrn_version >= 2.1) {	
-			if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+			if(($contact['duplex'] && strlen($contact['pubkey'])) 
+				|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+				|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
+
 				openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
 			}
 			else {
@@ -1481,7 +1522,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
 							dbesc($datarray['body']),
 							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 							dbesc($item_id),
@@ -1611,7 +1653,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
 							dbesc($datarray['body']),
 							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 							dbesc($item_id),
@@ -1806,6 +1849,7 @@ function local_delivery($importer,$data) {
 			'language'     => $importer['language'],
 			'to_name'      => $importer['username'],
 			'to_email'     => $importer['email'],
+			'uid'          => $importer['importer_uid'],
 			'item'         => $fsugg,
 			'link'         => $a->get_baseurl() . '/notifications/intros',
 			'source_name'  => $importer['name'],
@@ -1857,6 +1901,7 @@ function local_delivery($importer,$data) {
 			'language' => $importer['language'],
 			'to_name' => $importer['username'],
 			'to_email' => $importer['email'],
+			'uid' => $importer['importer_uid'],
 			'item' => $msg,
 			'source_name' => $msg['from-name'],
 			'source_link' => $importer['url'],
@@ -2129,6 +2174,7 @@ function local_delivery($importer,$data) {
 								'language'     => $importer['language'],
 								'to_name'      => $importer['username'],
 								'to_email'     => $importer['email'],
+								'uid'          => $importer['importer_uid'],
 								'item'         => $datarray,
 								'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 								'source_name'  => stripslashes($datarray['author-name']),
@@ -2162,7 +2208,8 @@ function local_delivery($importer,$data) {
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
 							dbesc($datarray['body']),
 							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 							dbesc($item_id),
@@ -2248,6 +2295,7 @@ function local_delivery($importer,$data) {
 								'language'     => $importer['language'],
 								'to_name'      => $importer['username'],
 								'to_email'     => $importer['email'],
+								'uid'          => $importer['importer_uid'],
 								'item'         => $datarray,
 								'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 								'source_name'  => stripslashes($datarray['author-name']),
@@ -2304,7 +2352,8 @@ function local_delivery($importer,$data) {
 
 			if(count($r)) {
 				if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-					$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc($datarray['title']),
 						dbesc($datarray['body']),
 						dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 						dbesc($item_id),
@@ -2800,7 +2849,7 @@ function drop_item($id,$interactive = true) {
 
 		// delete the item
 
-		$r = q("UPDATE `item` SET `deleted` = 1, `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+		$r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($item['id'])
@@ -2833,7 +2882,7 @@ function drop_item($id,$interactive = true) {
 		// If it's the parent of a comment thread, kill all the kids
 
 		if($item['uri'] == $item['parent-uri']) {
-			$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' 
+			$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = ''
 				WHERE `parent-uri` = '%s' AND `uid` = %d ",
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),

include/network.php

@@ -579,6 +579,9 @@ function fetch_xrd_links($url) {
 
 if(! function_exists('validate_url')) {
 function validate_url(&$url) {
+	// no naked subdomains
+	if(strpos($url,'.') === false)
+		return false;
 	if(substr($url,0,4) != 'http')
 		$url = 'http://' . $url;
 	$h = @parse_url($url);

include/notifier.php

@@ -35,7 +35,7 @@ function notifier_run($argv, $argc){
 	require_once("datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
-
+	require_once('include/email.php');
 	load_config('config');
 	load_config('system');
 
@@ -264,7 +264,7 @@ function notifier_run($argv, $argc){
 			$deny_people  = expand_acl($parent['deny_cid']);
 			$deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
 
-			// if our parent is a forum, uplink to the origonal author causing
+			// if our parent is a forum, uplink to the origional author causing
 			// a delivery fork
 
 			if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
@@ -526,6 +526,14 @@ function notifier_run($argv, $argc){
 						);
 
 						if(count($x)) {
+
+							if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
+								q("update contact set writable = 1 where id = %d limit 1",
+									intval($x[0]['id'])
+								);
+								$x[0]['writable'] = 1;
+							}
+
 							require_once('library/simplepie/simplepie.inc');
 							logger('mod-delivery: local delivery');
 							local_delivery($x[0],$atom);
@@ -584,6 +592,7 @@ function notifier_run($argv, $argc){
 					break;
 
 				case NETWORK_MAIL:
+				case NETWORK_MAIL2:
 						
 					if(get_config('system','dfrn_only'))
 						break;
@@ -625,14 +634,14 @@ function notifier_run($argv, $argc){
 						if($r1 && $r1[0]['reply_to'])
 							$reply_to = $r1[0]['reply_to'];
 	
-						$subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
+						$subject  = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
 
 						// only expose our real email address to true friends
 
-						if($contact['rel'] == CONTACT_IS_FRIEND)
-							$headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+						if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
+							$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
 						else
-							$headers  = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+							$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
 
 						if($reply_to)
 							$headers .= 'Reply-to: ' . $reply_to . "\n";
@@ -754,9 +763,10 @@ function notifier_run($argv, $argc){
 		);
 			
 		$r2 = q("SELECT `id`, `name`,`network` FROM `contact` 
-			WHERE `network` = '%s' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
+			WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
 			AND `rel` != %d order by rand() ",
 			dbesc(NETWORK_DFRN),
+			dbesc(NETWORK_MAIL2),
 			intval($owner['uid']),
 			intval(CONTACT_IS_SHARING)
 		);

include/plugin.php

@@ -57,11 +57,14 @@ function reload_plugins() {
 			foreach($parr as $pl) {
 				$pl = trim($pl);
 
-				$t = filemtime('addon/' . $pl . '/' . $pl . '.php');
+				$fname = 'addon/' . $pl . '/' . $pl . '.php';
+				
+				if(file_exists($fname)) {
+					$t = @filemtime($fname);
 					foreach($installed as $i) {
 						if(($i['name'] == $pl) && ($i['timestamp'] != $t)) {	
 							logger('Reloading plugin: ' . $i['name']);
-						@include_once('addon/' . $pl . '/' . $pl . '.php');
+							@include_once($fname);
 
 							if(function_exists($pl . '_uninstall')) {
 								$func = $pl . '_uninstall';
@@ -80,6 +83,7 @@ function reload_plugins() {
 				}
 			}
 		}
+	}
 }}
 				
 

include/poller.php

@@ -369,7 +369,7 @@ function poller_run($argv, $argc){
 
 				$xml = fetch_url($contact['poll']);
 			}
-			elseif($contact['network'] === NETWORK_MAIL) {
+			elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
 
 				$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
 				if($mail_disabled)
@@ -462,7 +462,7 @@ function poller_run($argv, $argc){
 							$datarray['contact-id'] = $contact['id'];
 							if($datarray['parent-uri'] === $datarray['uri'])
 								$datarray['private'] = 1;
-							if(! get_pconfig($importer_uid,'system','allow_public_email_replies')) {
+							if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) {
 								$datarray['private'] = 1;
 								$datarray['allow_cid'] = '<' . $contact['id'] . '>';
 							}

include/profile_advanced.php

@@ -44,6 +44,8 @@ function advanced_profile(&$a) {
 
 		if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
 
+		if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
+
 		if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
 
 		if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);

include/text.php

@@ -428,7 +428,9 @@ if(! function_exists('logger')) {
 function logger($msg,$level = 0) {
 	// turn off logger in install mode
 	global $a;
-	if ($a->module == 'install') return;
+	global $db;
+
+	if(($a->module == 'install') || (! ($db && $db->connected))) return;
 
 	$debugging = get_config('system','debugging');
 	$loglevel  = intval(get_config('system','loglevel'));
@@ -538,8 +540,10 @@ function contact_block() {
 	$a = get_app();
 
 	$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
-	if(! $shown)
+	if($shown === false)
 		$shown = 24;
+	if($shown == 0)
+		return;
 
 	if((! is_array($a->profile)) || ($a->profile['hide-friends']))
 		return $o;
@@ -674,41 +678,105 @@ function linkify($s) {
  */
 
 if(! function_exists('smilies')) {
-function smilies($s) {
+function smilies($s, $sample = false) {
 	$a = get_app();
 
-	$s = str_replace(
-	array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', 
-		'~friendika', '~friendica', 'Diaspora*' ),
-	array(
+	$texts =  array( 
+		'<3', 
+		'</3', 
+		'<\\3', 
+		':-)', 
+//		':)', 
+		';-)', 
+//		';)', 
+		':-(', 
+//		':(', 
+		':-P', 
+//		':P', 
+		':-"', 
+		':-"', 
+		':-x', 
+		':-X', 
+		':-D', 
+//		':D', 
+		'8-|', 
+		'8-O', 
+		':-O', 
+		'\\o/', 
+		'o.O', 
+		'O.o', 
+		'\\.../', 
+		'\\ooo/', 
+		":'(", 
+		":-!", 
+		":-/", 
+		":-[", 
+		"8-)",
+		':beer', 
+		':homebrew', 
+		':coffee', 
+		':facepalm',
+		':headdesk',
+		'~friendika', 
+		'~friendica', 
+		'Diaspora*' 
+	);
+
+	$icons = array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
-		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />',
+//		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
+//		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";)"/>',                
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
-		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
+//		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
-		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":P" />',
+//		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":P" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
+//		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":D"/>',                
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',                
 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-cool.gif" alt="8-)" />',
+		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
+		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
+		'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
 
-	), $s);
+	);
+
+	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
+	call_hooks('smilie', $params);
+
+	if($sample) {
+		$s = '<div class="smiley-sample">';
+		for($x = 0; $x < count($params['texts']); $x ++) {
+			$s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
+		}
+	}
+	else {
+		$s = str_replace($params['texts'],$params['icons'],$params['string']);
+	}
              
-	call_hooks('smilie', $s);
 	return $s;
 
 }}
@@ -785,10 +853,10 @@ function prepare_body($item,$attach = false) {
 					case 'audio':
 					case 'image':
 					case 'text':
-						$icon = '<div class="attachtype type-' . $icontype . '"></div>';
+						$icon = '<div class="attachtype icon s22 type-' . $icontype . '"></div>';
 						break;
 					default:
-						$icon = '<div class="attachtype type-unkn"></div>';
+						$icon = '<div class="attachtype icon s22 type-unkn"></div>';
 						break;
 				}
 				$title = ((strlen(trim($matches[4]))) ? escape_tags(trim($matches[4])) : escape_tags($matches[1]));
@@ -814,6 +882,9 @@ function prepare_text($text) {
 
 	require_once('include/bbcode.php');
 
+	if(stristr($text,'[nosmile]'))
+		$s = bbcode($text);
+	else
 		$s = smilies(bbcode($text));
 
 	return $s;

library/fullcalendar/GPL-LICENSE.txt

@@ -0,0 +1,278 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.

library/fullcalendar/MIT-LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Adam Shaw
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

library/fullcalendar/changelog.txt

@@ -0,0 +1,318 @@
+
+version 1.5.3 (2/6/12)
+	- fixed dragging issue with jQuery UI 1.8.16 (issue 1168)
+	- bundled with jQuery 1.7.1 and jQuery UI 1.8.17
+
+version 1.5.2 (8/21/11)
+	- correctly process UTC "Z" ISO8601 date strings (issue 750)
+
+version 1.5.1 (4/9/11)
+	- more flexible ISO8601 date parsing (issue 814)
+	- more flexible parsing of UNIX timestamps (issue 826)
+	- FullCalendar now buildable from source on a Mac (issue 795)
+	- FullCalendar QA'd in FF4 (issue 883)
+	- upgraded to jQuery 1.5.2 (which supports IE9) and jQuery UI 1.8.11
+
+version 1.5 (3/19/11)
+	- slicker default styling for buttons
+	- reworked a lot of the calendar's HTML and accompanying CSS
+	  (solves issues 327 and 395)
+	- more printer-friendly (fullcalendar-print.css)
+	- fullcalendar now inherits styles from jquery-ui themes differently.
+	  styles for buttons are distinct from styles for calendar cells.
+	  (solves issue 299)
+	- can now color events through FullCalendar options and Event-Object properties (issue 117)
+	  THIS IS NOW THE PREFERRED METHOD OF COLORING EVENTS (as opposed to using className and CSS)
+		- FullCalendar options:
+			- eventColor (changes both background and border)
+			- eventBackgroundColor
+			- eventBorderColor
+			- eventTextColor
+		- Event-Object options:
+			- color (changes both background and border)
+			- backgroundColor
+			- borderColor
+			- textColor
+	- can now specify an event source as an *object* with a `url` property (json feed) or
+	  an `events` property (function or array) with additional properties that will
+	  be applied to the entire event source:
+		- color (changes both background and border)
+		- backgroudColor
+		- borderColor
+		- textColor
+		- className
+		- editable
+		- allDayDefault
+		- ignoreTimezone
+		- startParam (for a feed)
+		- endParam   (for a feed)
+		- ANY OF THE JQUERY $.ajax OPTIONS
+		  allows for easily changing from GET to POST and sending additional parameters (issue 386)
+		  allows for easily attaching ajax handlers such as `error` (issue 754)
+		  allows for turning caching on (issue 355)
+	- Google Calendar feeds are now specified differently:
+		- specify a simple string of your feed's URL
+		- specify an *object* with a `url` property of your feed's URL.
+		  you can include any of the new Event-Source options in this object.
+		- the old `$.fullCalendar.gcalFeed` method still works
+	- no more IE7 SSL popup (issue 504)
+	- remove `cacheParam` - use json event source `cache` option instead
+	- latest jquery/jquery-ui
+
+version 1.4.11 (2/22/11)
+	- fixed rerenderEvents bug (issue 790)
+	- fixed bug with faulty dragging of events from all-day slot in agenda views
+	- bundled with jquery 1.5 and jquery-ui 1.8.9
+
+version 1.4.10 (1/2/11)
+	- fixed bug with resizing event to different week in 5-day month view (issue 740)
+	- fixed bug with events not sticking after a removeEvents call (issue 757)
+	- fixed bug with underlying parseTime method, and other uses of parseInt (issue 688)
+
+version 1.4.9 (11/16/10)
+	- new algorithm for vertically stacking events (issue 111)
+	- resizing an event to a different week (issue 306)
+	- bug: some events not rendered with consecutive calls to addEventSource (issue 679)
+
+version 1.4.8 (10/16/10)
+	- ignoreTimezone option (set to `false` to process UTC offsets in ISO8601 dates)
+	- bugfixes
+		- event refetching not being called under certain conditions (issues 417, 554)
+		- event refetching being called multiple times under certain conditions (issues 586, 616)
+		- selection cannot be triggered by right mouse button (issue 558)
+		- agenda view left axis sized incorrectly (issue 465)
+		- IE js error when calendar is too narrow (issue 517)
+		- agenda view looks strange when no scrollbars (issue 235)
+		- improved parsing of ISO8601 dates with UTC offsets
+	- $.fullCalendar.version
+	- an internal refactor of the code, for easier future development and modularity
+
+version 1.4.7 (7/5/10)
+	- "dropping" external objects onto the calendar
+		- droppable (boolean, to turn on/off)
+		- dropAccept (to filter which events the calendar will accept)
+		- drop (trigger)
+	- selectable options can now be specified with a View Option Hash
+	- bugfixes
+		- dragged & reverted events having wrong time text (issue 406)
+		- bug rendering events that have an endtime with seconds, but no hours/minutes (issue 477)
+		- gotoDate date overflow bug (issue 429)
+		- wrong date reported when clicking on edge of last column in agenda views (412)
+	- support newlines in event titles
+	- select/unselect callbacks now passes native js event
+
+version 1.4.6 (5/31/10)
+	- "selecting" days or timeslots
+		- options: selectable, selectHelper, unselectAuto, unselectCancel
+		- callbacks: select, unselect
+		- methods: select, unselect
+	- when dragging an event, the highlighting reflects the duration of the event
+	- code compressing by Google Closure Compiler
+	- bundled with jQuery 1.4.2 and jQuery UI 1.8.1
+
+version 1.4.5 (2/21/10)
+	- lazyFetching option, which can force the calendar to fetch events on every view/date change
+	- scroll state of agenda views are preserved when switching back to view
+	- bugfixes
+		- calling methods on an uninitialized fullcalendar throws error
+		- IE6/7 bug where an entire view becomes invisible (issue 320)
+		- error when rendering a hidden calendar (in jquery ui tabs for example) in IE (issue 340)
+		- interconnected bugs related to calendar resizing and scrollbars
+			- when switching views or clicking prev/next, calendar would "blink" (issue 333)
+			- liquid-width calendar's events shifted (depending on initial height of browser) (issue 341)
+			- more robust underlying algorithm for calendar resizing
+
+version 1.4.4 (2/3/10)
+	- optimized event rendering in all views (events render in 1/10 the time)
+	- gotoDate() does not force the calendar to unnecessarily rerender
+	- render() method now correctly readjusts height
+
+version 1.4.3 (12/22/09)
+	- added destroy method
+	- Google Calendar event pages respect currentTimezone
+	- caching now handled by jQuery's ajax	
+	- protection from setting aspectRatio to zero
+	- bugfixes
+		- parseISO8601 and DST caused certain events to display day before
+		- button positioning problem in IE6
+		- ajax event source removed after recently being added, events still displayed
+		- event not displayed when end is an empty string
+		- dynamically setting calendar height when no events have been fetched, throws error
+
+version 1.4.2 (12/02/09)
+	- eventAfterRender trigger
+	- getDate & getView methods
+	- height & contentHeight options (explicitly sets the pixel height)
+	- minTime & maxTime options (restricts shown hours in agenda view)
+	- getters [for all options] and setters [for height, contentHeight, and aspectRatio ONLY! stay tuned..]
+	- render method now readjusts calendar's size
+	- bugfixes
+		- lightbox scripts that use iframes (like fancybox)
+		- day-of-week classNames were off when firstDay=1
+		- guaranteed space on right side of agenda events (even when stacked)
+		- accepts ISO8601 dates with a space (instead of 'T')
+
+version 1.4.1 (10/31/09)
+	- can exclude weekends with new 'weekends' option
+	- gcal feed 'currentTimezone' option
+	- bugfixes
+		- year/month/date option sometimes wouldn't set correctly (depending on current date)
+		- daylight savings issue caused agenda views to start at 1am (for BST users)
+	- cleanup of gcal.js code
+
+version 1.4 (10/19/09)
+	- agendaWeek and agendaDay views
+	- added some options for agenda views:
+		- allDaySlot
+		- allDayText
+		- firstHour
+		- slotMinutes
+		- defaultEventMinutes
+		- axisFormat
+	- modified some existing options/triggers to work with agenda views:
+		- dragOpacity and timeFormat can now accept a "View Hash" (a new concept)
+		- dayClick now has an allDay parameter
+		- eventDrop now has an an allDay parameter
+		  (this will affect those who use revertFunc, adjust parameter list)
+	- added 'prevYear' and 'nextYear' for buttons in header
+	- minor change for theme users, ui-state-hover not applied to active/inactive buttons
+	- added event-color-changing example in docs
+	- better defaults for right-to-left themed button icons
+
+version 1.3.2 (10/13/09)
+	- Bugfixes (please upgrade from 1.3.1!)
+		- squashed potential infinite loop when addMonths and addDays
+		  is called with an invalid date
+		- $.fullCalendar.parseDate() now correctly parses IETF format
+		- when switching views, the 'today' button sticks inactive, fixed
+	- gotoDate now can accept a single Date argument
+	- documentation for changes in 1.3.1 and 1.3.2 now on website
+
+version 1.3.1 (9/30/09)
+	- Important Bugfixes (please upgrade from 1.3!)
+		- When current date was late in the month, for long months, and prev/next buttons
+		  were clicked in month-view, some months would be skipped/repeated
+		- In certain time zones, daylight savings time would cause certain days
+		  to be misnumbered in month-view
+	- Subtle change in way week interval is chosen when switching from month to basicWeek/basicDay view
+	- Added 'allDayDefault' option
+	- Added 'changeView' and 'render' methods
+
+version 1.3 (9/21/09)
+	- different 'views': month/basicWeek/basicDay
+	- more flexible 'header' system for buttons
+	- themable by jQuery UI themes
+	- resizable events (require jQuery UI resizable plugin)
+	- rescoped & rewritten CSS, enhanced default look
+	- cleaner css & rendering techniques for right-to-left
+	- reworked options & API to support multiple views / be consistent with jQuery UI
+	- refactoring of entire codebase
+		- broken into different JS & CSS files, assembled w/ build scripts
+		- new test suite for new features, uses firebug-lite
+	- refactored docs
+	- Options
+		+ date
+		+ defaultView
+		+ aspectRatio
+		+ disableResizing
+		+ monthNames      (use instead of $.fullCalendar.monthNames)
+		+ monthNamesShort (use instead of $.fullCalendar.monthAbbrevs)
+		+ dayNames        (use instead of $.fullCalendar.dayNames)
+		+ dayNamesShort   (use instead of $.fullCalendar.dayAbbrevs)
+		+ theme
+		+ buttonText
+		+ buttonIcons
+		x draggable           -> editable/disableDragging
+		x fixedWeeks          -> weekMode
+		x abbrevDayHeadings   -> columnFormat
+		x buttons/title       -> header
+		x eventDragOpacity    -> dragOpacity
+		x eventRevertDuration -> dragRevertDuration
+		x weekStart           -> firstDay
+		x rightToLeft         -> isRTL
+		x showTime (use 'allDay' CalEvent property instead)
+	- Triggered Actions
+		+ eventResizeStart
+		+ eventResizeStop
+		+ eventResize
+		x monthDisplay -> viewDisplay
+		x resize       -> windowResize
+		'eventDrop' params changed, can revert if ajax cuts out
+	- CalEvent Properties
+		x showTime  -> allDay
+		x draggable -> editable
+		'end' is now INCLUSIVE when allDay=true
+		'url' now produces a real <a> tag, more native clicking/tab behavior
+	- Methods:
+		+ renderEvent
+		x prevMonth         -> prev
+		x nextMonth         -> next
+		x prevYear/nextYear -> moveDate
+		x refresh           -> rerenderEvents/refetchEvents
+		x removeEvent       -> removeEvents
+		x getEventsByID     -> clientEvents
+	- Utilities:
+		'formatDate' format string completely changed (inspired by jQuery UI datepicker + datejs)
+		'formatDates' added to support date-ranges
+	- Google Calendar Options:
+		x draggable -> editable
+	- Bugfixes
+		- gcal extension fetched 25 results max, now fetches all
+
+version 1.2.1 (6/29/09)
+	- bugfixes
+		- allows and corrects invalid end dates for events
+		- doesn't throw an error in IE while rendering when display:none
+		- fixed 'loading' callback when used w/ multiple addEventSource calls
+		- gcal className can now be an array
+
+version 1.2 (5/31/09)
+	- expanded API
+		- 'className' CalEvent attribute
+		- 'source' CalEvent attribute
+		- dynamically get/add/remove/update events of current month
+		- locale improvements: change month/day name text
+		- better date formatting ($.fullCalendar.formatDate)
+		- multiple 'event sources' allowed
+			- dynamically add/remove event sources
+	- options for prevYear and nextYear buttons
+	- docs have been reworked (include addition of Google Calendar docs)
+	- changed behavior of parseDate for number strings
+	  (now interpets as unix timestamp, not MS times)
+	- bugfixes
+		- rightToLeft month start bug
+		- off-by-one errors with month formatting commands
+		- events from previous months sticking when clicking prev/next quickly
+	- Google Calendar API changed to work w/ multiple event sources
+		- can also provide 'className' and 'draggable' options
+	- date utilties moved from $ to $.fullCalendar
+	- more documentation in source code
+	- minified version of fullcalendar.js
+	- test suit (available from svn)
+	- top buttons now use <button> w/ an inner <span> for better css cusomization
+		- thus CSS has changed. IF UPGRADING FROM PREVIOUS VERSIONS,
+		  UPGRADE YOUR FULLCALENDAR.CSS FILE!!!
+
+version 1.1 (5/10/09)
+	- Added the following options:
+		- weekStart
+		- rightToLeft
+		- titleFormat
+		- timeFormat
+		- cacheParam
+		- resize
+	- Fixed rendering bugs
+		- Opera 9.25 (events placement & window resizing)
+		- IE6 (window resizing)
+	- Optimized window resizing for ALL browsers
+	- Events on same day now sorted by start time (but first by timespan)
+	- Correct z-index when dragging
+	- Dragging contained in overflow DIV for IE6
+	- Modified fullcalendar.css
+		- for right-to-left support
+		- for variable start-of-week
+		- for IE6 resizing bug
+		- for THEAD and TBODY (in 1.0, just used TBODY, restructured in 1.1)
+		- IF UPGRADING FROM FULLCALENDAR 1.0, YOU MUST UPGRADE FULLCALENDAR.CSS
+		  !!!!!!!!!!!
+		  

library/fullcalendar/fullcalendar.css

@@ -0,0 +1,618 @@
+/*
+ * FullCalendar v1.5.3 Stylesheet
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Mon Feb 6 22:40:40 2012 -0800
+ *
+ */
+
+
+.fc {
+	direction: ltr;
+	text-align: left;
+	}
+	
+.fc table {
+	border-collapse: collapse;
+	border-spacing: 0;
+	}
+	
+html .fc,
+.fc table {
+	font-size: 1em;
+	}
+	
+.fc td,
+.fc th {
+	padding: 0;
+	vertical-align: top;
+	}
+
+
+
+/* Header
+------------------------------------------------------------------------*/
+
+.fc-header td {
+	white-space: nowrap;
+	}
+
+.fc-header-left {
+	width: 25%;
+	text-align: left;
+	}
+	
+.fc-header-center {
+	text-align: center;
+	}
+	
+.fc-header-right {
+	width: 25%;
+	text-align: right;
+	}
+	
+.fc-header-title {
+	display: inline-block;
+	vertical-align: top;
+	}
+	
+.fc-header-title h2 {
+	margin-top: 0;
+	white-space: nowrap;
+	}
+	
+.fc .fc-header-space {
+	padding-left: 10px;
+	}
+	
+.fc-header .fc-button {
+	margin-bottom: 1em;
+	vertical-align: top;
+	}
+	
+/* buttons edges butting together */
+
+.fc-header .fc-button {
+	margin-right: -1px;
+	}
+	
+.fc-header .fc-corner-right {
+	margin-right: 1px; /* back to normal */
+	}
+	
+.fc-header .ui-corner-right {
+	margin-right: 0; /* back to normal */
+	}
+	
+/* button layering (for border precedence) */
+	
+.fc-header .fc-state-hover,
+.fc-header .ui-state-hover {
+	z-index: 2;
+	}
+	
+.fc-header .fc-state-down {
+	z-index: 3;
+	}
+
+.fc-header .fc-state-active,
+.fc-header .ui-state-active {
+	z-index: 4;
+	}
+	
+	
+	
+/* Content
+------------------------------------------------------------------------*/
+	
+.fc-content {
+	clear: both;
+	}
+	
+.fc-view {
+	width: 100%; /* needed for view switching (when view is absolute) */
+	overflow: hidden;
+	}
+	
+	
+
+/* Cell Styles
+------------------------------------------------------------------------*/
+
+.fc-widget-header,    /* <th>, usually */
+.fc-widget-content {  /* <td>, usually */
+	border: 1px solid #ccc;
+	}
+	
+.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
+	background: #ffc;
+	}
+	
+.fc-cell-overlay { /* semi-transparent rectangle while dragging */
+	background: #9cf;
+	opacity: .2;
+	filter: alpha(opacity=20); /* for IE */
+	}
+	
+
+
+/* Buttons
+------------------------------------------------------------------------*/
+
+.fc-button {
+	position: relative;
+	display: inline-block;
+	cursor: pointer;
+	}
+	
+.fc-state-default { /* non-theme */
+	border-style: solid;
+	border-width: 1px 0;
+	}
+	
+.fc-button-inner {
+	position: relative;
+	float: left;
+	overflow: hidden;
+	}
+	
+.fc-state-default .fc-button-inner { /* non-theme */
+	border-style: solid;
+	border-width: 0 1px;
+	}
+	
+.fc-button-content {
+	position: relative;
+	float: left;
+	height: 1.9em;
+	line-height: 1.9em;
+	padding: 0 .6em;
+	white-space: nowrap;
+	}
+	
+/* icon (for jquery ui) */
+	
+.fc-button-content .fc-icon-wrap {
+	position: relative;
+	float: left;
+	top: 50%;
+	}
+	
+.fc-button-content .ui-icon {
+	position: relative;
+	float: left;
+	margin-top: -50%;
+	*margin-top: 0;
+	*top: -50%;
+	}
+	
+/* gloss effect */
+	
+.fc-state-default .fc-button-effect {
+	position: absolute;
+	top: 50%;
+	left: 0;
+	}
+	
+.fc-state-default .fc-button-effect span {
+	position: absolute;
+	top: -100px;
+	left: 0;
+	width: 500px;
+	height: 100px;
+	border-width: 100px 0 0 1px;
+	border-style: solid;
+	border-color: #fff;
+	background: #444;
+	opacity: .09;
+	filter: alpha(opacity=9);
+	}
+	
+/* button states (determines colors)  */
+	
+.fc-state-default,
+.fc-state-default .fc-button-inner {
+	border-style: solid;
+	border-color: #ccc #bbb #aaa;
+	background: #F3F3F3;
+	color: #000;
+	}
+	
+.fc-state-hover,
+.fc-state-hover .fc-button-inner {
+	border-color: #999;
+	}
+	
+.fc-state-down,
+.fc-state-down .fc-button-inner {
+	border-color: #555;
+	background: #777;
+	}
+	
+.fc-state-active,
+.fc-state-active .fc-button-inner {
+	border-color: #555;
+	background: #777;
+	color: #fff;
+	}
+	
+.fc-state-disabled,
+.fc-state-disabled .fc-button-inner {
+	color: #999;
+	border-color: #ddd;
+	}
+	
+.fc-state-disabled {
+	cursor: default;
+	}
+	
+.fc-state-disabled .fc-button-effect {
+	display: none;
+	}
+	
+	
+
+/* Global Event Styles
+------------------------------------------------------------------------*/
+	 
+.fc-event {
+	border-style: solid;
+	border-width: 0;
+	font-size: .85em;
+	cursor: default;
+	}
+	
+a.fc-event,
+.fc-event-draggable {
+	cursor: pointer;
+	}
+	
+a.fc-event {
+	text-decoration: none;
+	}
+	
+.fc-rtl .fc-event {
+	text-align: right;
+	}
+	
+.fc-event-skin {
+	border-color: #36c;     /* default BORDER color */
+	background-color: #36c; /* default BACKGROUND color */
+	color: #fff;            /* default TEXT color */
+	}
+	
+.fc-event-inner {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	border-style: solid;
+	border-width: 0;
+	overflow: hidden;
+	}
+	
+.fc-event-time,
+.fc-event-title {
+	padding: 0 1px;
+	}
+	
+.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
+	display: block;
+	position: absolute;
+	z-index: 99999;
+	overflow: hidden; /* hacky spaces (IE6/7) */
+	font-size: 300%;  /* */
+	line-height: 50%; /* */
+	}
+	
+	
+	
+/* Horizontal Events
+------------------------------------------------------------------------*/
+
+.fc-event-hori {
+	border-width: 1px 0;
+	margin-bottom: 1px;
+	}
+	
+/* resizable */
+	
+.fc-event-hori .ui-resizable-e {
+	top: 0           !important; /* importants override pre jquery ui 1.7 styles */
+	right: -3px      !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: e-resize;
+	}
+	
+.fc-event-hori .ui-resizable-w {
+	top: 0           !important;
+	left: -3px       !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: w-resize;
+	}
+	
+.fc-event-hori .ui-resizable-handle {
+	_padding-bottom: 14px; /* IE6 had 0 height */
+	}
+	
+	
+	
+/* Fake Rounded Corners (for buttons and events)
+------------------------------------------------------------*/
+	
+.fc-corner-left {
+	margin-left: 1px;
+	}
+	
+.fc-corner-left .fc-button-inner,
+.fc-corner-left .fc-event-inner {
+	margin-left: -1px;
+	}
+	
+.fc-corner-right {
+	margin-right: 1px;
+	}
+	
+.fc-corner-right .fc-button-inner,
+.fc-corner-right .fc-event-inner {
+	margin-right: -1px;
+	}
+	
+.fc-corner-top {
+	margin-top: 1px;
+	}
+	
+.fc-corner-top .fc-event-inner {
+	margin-top: -1px;
+	}
+	
+.fc-corner-bottom {
+	margin-bottom: 1px;
+	}
+	
+.fc-corner-bottom .fc-event-inner {
+	margin-bottom: -1px;
+	}
+	
+	
+	
+/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
+-----------------------------------------------------------------*/
+	
+.fc-corner-left .fc-event-inner {
+	border-left-width: 1px;
+	}
+	
+.fc-corner-right .fc-event-inner {
+	border-right-width: 1px;
+	}
+	
+.fc-corner-top .fc-event-inner {
+	border-top-width: 1px;
+	}
+	
+.fc-corner-bottom .fc-event-inner {
+	border-bottom-width: 1px;
+	}
+	
+	
+	
+/* Reusable Separate-border Table
+------------------------------------------------------------*/
+
+table.fc-border-separate {
+	border-collapse: separate;
+	}
+	
+.fc-border-separate th,
+.fc-border-separate td {
+	border-width: 1px 0 0 1px;
+	}
+	
+.fc-border-separate th.fc-last,
+.fc-border-separate td.fc-last {
+	border-right-width: 1px;
+	}
+	
+.fc-border-separate tr.fc-last th,
+.fc-border-separate tr.fc-last td {
+	border-bottom-width: 1px;
+	}
+	
+.fc-border-separate tbody tr.fc-first td,
+.fc-border-separate tbody tr.fc-first th {
+	border-top-width: 0;
+	}
+	
+	
+
+/* Month View, Basic Week View, Basic Day View
+------------------------------------------------------------------------*/
+
+.fc-grid th {
+	text-align: center;
+	}
+	
+.fc-grid .fc-day-number {
+	float: right;
+	padding: 0 2px;
+	}
+	
+.fc-grid .fc-other-month .fc-day-number {
+	opacity: 0.3;
+	filter: alpha(opacity=30); /* for IE */
+	/* opacity with small font can sometimes look too faded
+	   might want to set the 'color' property instead
+	   making day-numbers bold also fixes the problem */
+	}
+	
+.fc-grid .fc-day-content {
+	clear: both;
+	padding: 2px 2px 1px; /* distance between events and day edges */
+	}
+	
+/* event styles */
+	
+.fc-grid .fc-event-time {
+	font-weight: bold;
+	}
+	
+/* right-to-left */
+	
+.fc-rtl .fc-grid .fc-day-number {
+	float: left;
+	}
+	
+.fc-rtl .fc-grid .fc-event-time {
+	float: right;
+	}
+	
+	
+
+/* Agenda Week View, Agenda Day View
+------------------------------------------------------------------------*/
+
+.fc-agenda table {
+	border-collapse: separate;
+	}
+	
+.fc-agenda-days th {
+	text-align: center;
+	}
+	
+.fc-agenda .fc-agenda-axis {
+	width: 50px;
+	padding: 0 4px;
+	vertical-align: middle;
+	text-align: right;
+	white-space: nowrap;
+	font-weight: normal;
+	}
+	
+.fc-agenda .fc-day-content {
+	padding: 2px 2px 1px;
+	}
+	
+/* make axis border take precedence */
+	
+.fc-agenda-days .fc-agenda-axis {
+	border-right-width: 1px;
+	}
+	
+.fc-agenda-days .fc-col0 {
+	border-left-width: 0;
+	}
+	
+/* all-day area */
+	
+.fc-agenda-allday th {
+	border-width: 0 1px;
+	}
+	
+.fc-agenda-allday .fc-day-content {
+	min-height: 34px; /* TODO: doesnt work well in quirksmode */
+	_height: 34px;
+	}
+	
+/* divider (between all-day and slots) */
+	
+.fc-agenda-divider-inner {
+	height: 2px;
+	overflow: hidden;
+	}
+	
+.fc-widget-header .fc-agenda-divider-inner {
+	background: #eee;
+	}
+	
+/* slot rows */
+	
+.fc-agenda-slots th {
+	border-width: 1px 1px 0;
+	}
+	
+.fc-agenda-slots td {
+	border-width: 1px 0 0;
+	background: none;
+	}
+	
+.fc-agenda-slots td div {
+	height: 20px;
+	}
+	
+.fc-agenda-slots tr.fc-slot0 th,
+.fc-agenda-slots tr.fc-slot0 td {
+	border-top-width: 0;
+	}
+
+.fc-agenda-slots tr.fc-minor th,
+.fc-agenda-slots tr.fc-minor td {
+	border-top-style: dotted;
+	}
+	
+.fc-agenda-slots tr.fc-minor th.ui-widget-header {
+	*border-top-style: solid; /* doesn't work with background in IE6/7 */
+	}
+	
+
+
+/* Vertical Events
+------------------------------------------------------------------------*/
+
+.fc-event-vert {
+	border-width: 0 1px;
+	}
+	
+.fc-event-vert .fc-event-head,
+.fc-event-vert .fc-event-content {
+	position: relative;
+	z-index: 2;
+	width: 100%;
+	overflow: hidden;
+	}
+	
+.fc-event-vert .fc-event-time {
+	white-space: nowrap;
+	font-size: 10px;
+	}
+	
+.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: #fff;
+	opacity: .3;
+	filter: alpha(opacity=30);
+	}
+	
+.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
+.fc-select-helper .fc-event-bg {
+	display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
+	}
+	
+/* resizable */
+	
+.fc-event-vert .ui-resizable-s {
+	bottom: 0        !important; /* importants override pre jquery ui 1.7 styles */
+	width: 100%      !important;
+	height: 8px      !important;
+	overflow: hidden !important;
+	line-height: 8px !important;
+	font-size: 11px  !important;
+	font-family: monospace;
+	text-align: center;
+	cursor: s-resize;
+	}
+	
+.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
+	_overflow: hidden;
+	}
+	
+	

library/fullcalendar/fullcalendar.min.js

@@ -0,0 +1,114 @@
+/*
+
+ FullCalendar v1.5.3
+ http://arshaw.com/fullcalendar/
+
+ Use fullcalendar.css for basic styling.
+ For event drag & drop, requires jQuery UI draggable.
+ For event resizing, requires jQuery UI resizable.
+
+ Copyright (c) 2011 Adam Shaw
+ Dual licensed under the MIT and GPL licenses, located in
+ MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+
+ Date: Mon Feb 6 22:40:40 2012 -0800
+
+*/
+(function(m,ma){function wb(a){m.extend(true,Ya,a)}function Yb(a,b,e){function d(k){if(E){u();q();na();S(k)}else f()}function f(){B=b.theme?"ui":"fc";a.addClass("fc");b.isRTL&&a.addClass("fc-rtl");b.theme&&a.addClass("ui-widget");E=m("<div class='fc-content' style='position:relative'/>").prependTo(a);C=new Zb(X,b);(P=C.render())&&a.prepend(P);y(b.defaultView);m(window).resize(oa);t()||g()}function g(){setTimeout(function(){!n.start&&t()&&S()},0)}function l(){m(window).unbind("resize",oa);C.destroy();
+E.remove();a.removeClass("fc fc-rtl ui-widget")}function j(){return i.offsetWidth!==0}function t(){return m("body")[0].offsetWidth!==0}function y(k){if(!n||k!=n.name){F++;pa();var D=n,Z;if(D){(D.beforeHide||xb)();Za(E,E.height());D.element.hide()}else Za(E,1);E.css("overflow","hidden");if(n=Y[k])n.element.show();else n=Y[k]=new Ja[k](Z=s=m("<div class='fc-view fc-view-"+k+"' style='position:absolute'/>").appendTo(E),X);D&&C.deactivateButton(D.name);C.activateButton(k);S();E.css("overflow","");D&&
+Za(E,1);Z||(n.afterShow||xb)();F--}}function S(k){if(j()){F++;pa();o===ma&&u();var D=false;if(!n.start||k||r<n.start||r>=n.end){n.render(r,k||0);fa(true);D=true}else if(n.sizeDirty){n.clearEvents();fa();D=true}else if(n.eventsDirty){n.clearEvents();D=true}n.sizeDirty=false;n.eventsDirty=false;ga(D);W=a.outerWidth();C.updateTitle(n.title);k=new Date;k>=n.start&&k<n.end?C.disableButton("today"):C.enableButton("today");F--;n.trigger("viewDisplay",i)}}function Q(){q();if(j()){u();fa();pa();n.clearEvents();
+n.renderEvents(J);n.sizeDirty=false}}function q(){m.each(Y,function(k,D){D.sizeDirty=true})}function u(){o=b.contentHeight?b.contentHeight:b.height?b.height-(P?P.height():0)-Sa(E):Math.round(E.width()/Math.max(b.aspectRatio,0.5))}function fa(k){F++;n.setHeight(o,k);if(s){s.css("position","relative");s=null}n.setWidth(E.width(),k);F--}function oa(){if(!F)if(n.start){var k=++v;setTimeout(function(){if(k==v&&!F&&j())if(W!=(W=a.outerWidth())){F++;Q();n.trigger("windowResize",i);F--}},200)}else g()}function ga(k){if(!b.lazyFetching||
+ya(n.visStart,n.visEnd))ra();else k&&da()}function ra(){K(n.visStart,n.visEnd)}function sa(k){J=k;da()}function ha(k){da(k)}function da(k){na();if(j()){n.clearEvents();n.renderEvents(J,k);n.eventsDirty=false}}function na(){m.each(Y,function(k,D){D.eventsDirty=true})}function ua(k,D,Z){n.select(k,D,Z===ma?true:Z)}function pa(){n&&n.unselect()}function U(){S(-1)}function ca(){S(1)}function ka(){gb(r,-1);S()}function qa(){gb(r,1);S()}function G(){r=new Date;S()}function p(k,D,Z){if(k instanceof Date)r=
+N(k);else yb(r,k,D,Z);S()}function L(k,D,Z){k!==ma&&gb(r,k);D!==ma&&hb(r,D);Z!==ma&&ba(r,Z);S()}function c(){return N(r)}function z(){return n}function H(k,D){if(D===ma)return b[k];if(k=="height"||k=="contentHeight"||k=="aspectRatio"){b[k]=D;Q()}}function T(k,D){if(b[k])return b[k].apply(D||i,Array.prototype.slice.call(arguments,2))}var X=this;X.options=b;X.render=d;X.destroy=l;X.refetchEvents=ra;X.reportEvents=sa;X.reportEventChange=ha;X.rerenderEvents=da;X.changeView=y;X.select=ua;X.unselect=pa;
+X.prev=U;X.next=ca;X.prevYear=ka;X.nextYear=qa;X.today=G;X.gotoDate=p;X.incrementDate=L;X.formatDate=function(k,D){return Oa(k,D,b)};X.formatDates=function(k,D,Z){return ib(k,D,Z,b)};X.getDate=c;X.getView=z;X.option=H;X.trigger=T;$b.call(X,b,e);var ya=X.isFetchNeeded,K=X.fetchEvents,i=a[0],C,P,E,B,n,Y={},W,o,s,v=0,F=0,r=new Date,J=[],M;yb(r,b.year,b.month,b.date);b.droppable&&m(document).bind("dragstart",function(k,D){var Z=k.target,ja=m(Z);if(!ja.parents(".fc").length){var ia=b.dropAccept;if(m.isFunction(ia)?
+ia.call(Z,ja):ja.is(ia)){M=Z;n.dragStart(M,k,D)}}}).bind("dragstop",function(k,D){if(M){n.dragStop(M,k,D);M=null}})}function Zb(a,b){function e(){q=b.theme?"ui":"fc";if(b.header)return Q=m("<table class='fc-header' style='width:100%'/>").append(m("<tr/>").append(f("left")).append(f("center")).append(f("right")))}function d(){Q.remove()}function f(u){var fa=m("<td class='fc-header-"+u+"'/>");(u=b.header[u])&&m.each(u.split(" "),function(oa){oa>0&&fa.append("<span class='fc-header-space'/>");var ga;
+m.each(this.split(","),function(ra,sa){if(sa=="title"){fa.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");ga&&ga.addClass(q+"-corner-right");ga=null}else{var ha;if(a[sa])ha=a[sa];else if(Ja[sa])ha=function(){na.removeClass(q+"-state-hover");a.changeView(sa)};if(ha){ra=b.theme?jb(b.buttonIcons,sa):null;var da=jb(b.buttonText,sa),na=m("<span class='fc-button fc-button-"+sa+" "+q+"-state-default'><span class='fc-button-inner'><span class='fc-button-content'>"+(ra?"<span class='fc-icon-wrap'><span class='ui-icon ui-icon-"+
+ra+"'/></span>":da)+"</span><span class='fc-button-effect'><span></span></span></span></span>");if(na){na.click(function(){na.hasClass(q+"-state-disabled")||ha()}).mousedown(function(){na.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-down")}).mouseup(function(){na.removeClass(q+"-state-down")}).hover(function(){na.not("."+q+"-state-active").not("."+q+"-state-disabled").addClass(q+"-state-hover")},function(){na.removeClass(q+"-state-hover").removeClass(q+"-state-down")}).appendTo(fa);
+ga||na.addClass(q+"-corner-left");ga=na}}}});ga&&ga.addClass(q+"-corner-right")});return fa}function g(u){Q.find("h2").html(u)}function l(u){Q.find("span.fc-button-"+u).addClass(q+"-state-active")}function j(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-active")}function t(u){Q.find("span.fc-button-"+u).addClass(q+"-state-disabled")}function y(u){Q.find("span.fc-button-"+u).removeClass(q+"-state-disabled")}var S=this;S.render=e;S.destroy=d;S.updateTitle=g;S.activateButton=l;S.deactivateButton=
+j;S.disableButton=t;S.enableButton=y;var Q=m([]),q}function $b(a,b){function e(c,z){return!ca||c<ca||z>ka}function d(c,z){ca=c;ka=z;L=[];c=++qa;G=z=U.length;for(var H=0;H<z;H++)f(U[H],c)}function f(c,z){g(c,function(H){if(z==qa){if(H){for(var T=0;T<H.length;T++){H[T].source=c;oa(H[T])}L=L.concat(H)}G--;G||ua(L)}})}function g(c,z){var H,T=Aa.sourceFetchers,X;for(H=0;H<T.length;H++){X=T[H](c,ca,ka,z);if(X===true)return;else if(typeof X=="object"){g(X,z);return}}if(H=c.events)if(m.isFunction(H)){u();
+H(N(ca),N(ka),function(C){z(C);fa()})}else m.isArray(H)?z(H):z();else if(c.url){var ya=c.success,K=c.error,i=c.complete;H=m.extend({},c.data||{});T=Ta(c.startParam,a.startParam);X=Ta(c.endParam,a.endParam);if(T)H[T]=Math.round(+ca/1E3);if(X)H[X]=Math.round(+ka/1E3);u();m.ajax(m.extend({},ac,c,{data:H,success:function(C){C=C||[];var P=$a(ya,this,arguments);if(m.isArray(P))C=P;z(C)},error:function(){$a(K,this,arguments);z()},complete:function(){$a(i,this,arguments);fa()}}))}else z()}function l(c){if(c=
+j(c)){G++;f(c,qa)}}function j(c){if(m.isFunction(c)||m.isArray(c))c={events:c};else if(typeof c=="string")c={url:c};if(typeof c=="object"){ga(c);U.push(c);return c}}function t(c){U=m.grep(U,function(z){return!ra(z,c)});L=m.grep(L,function(z){return!ra(z.source,c)});ua(L)}function y(c){var z,H=L.length,T,X=na().defaultEventEnd,ya=c.start-c._start,K=c.end?c.end-(c._end||X(c)):0;for(z=0;z<H;z++){T=L[z];if(T._id==c._id&&T!=c){T.start=new Date(+T.start+ya);T.end=c.end?T.end?new Date(+T.end+K):new Date(+X(T)+
+K):null;T.title=c.title;T.url=c.url;T.allDay=c.allDay;T.className=c.className;T.editable=c.editable;T.color=c.color;T.backgroudColor=c.backgroudColor;T.borderColor=c.borderColor;T.textColor=c.textColor;oa(T)}}oa(c);ua(L)}function S(c,z){oa(c);if(!c.source){if(z){pa.events.push(c);c.source=pa}L.push(c)}ua(L)}function Q(c){if(c){if(!m.isFunction(c)){var z=c+"";c=function(T){return T._id==z}}L=m.grep(L,c,true);for(H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=m.grep(U[H].events,c,true)}else{L=
+[];for(var H=0;H<U.length;H++)if(m.isArray(U[H].events))U[H].events=[]}ua(L)}function q(c){if(m.isFunction(c))return m.grep(L,c);else if(c){c+="";return m.grep(L,function(z){return z._id==c})}return L}function u(){p++||da("loading",null,true)}function fa(){--p||da("loading",null,false)}function oa(c){var z=c.source||{},H=Ta(z.ignoreTimezone,a.ignoreTimezone);c._id=c._id||(c.id===ma?"_fc"+bc++:c.id+"");if(c.date){if(!c.start)c.start=c.date;delete c.date}c._start=N(c.start=kb(c.start,H));c.end=kb(c.end,
+H);if(c.end&&c.end<=c.start)c.end=null;c._end=c.end?N(c.end):null;if(c.allDay===ma)c.allDay=Ta(z.allDayDefault,a.allDayDefault);if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[]}function ga(c){if(c.className){if(typeof c.className=="string")c.className=c.className.split(/\s+/)}else c.className=[];for(var z=Aa.sourceNormalizers,H=0;H<z.length;H++)z[H](c)}function ra(c,z){return c&&z&&sa(c)==sa(z)}function sa(c){return(typeof c=="object"?c.events||
+c.url:"")||c}var ha=this;ha.isFetchNeeded=e;ha.fetchEvents=d;ha.addEventSource=l;ha.removeEventSource=t;ha.updateEvent=y;ha.renderEvent=S;ha.removeEvents=Q;ha.clientEvents=q;ha.normalizeEvent=oa;var da=ha.trigger,na=ha.getView,ua=ha.reportEvents,pa={events:[]},U=[pa],ca,ka,qa=0,G=0,p=0,L=[];for(ha=0;ha<b.length;ha++)j(b[ha])}function gb(a,b,e){a.setFullYear(a.getFullYear()+b);e||Ka(a);return a}function hb(a,b,e){if(+a){b=a.getMonth()+b;var d=N(a);d.setDate(1);d.setMonth(b);a.setMonth(b);for(e||Ka(a);a.getMonth()!=
+d.getMonth();)a.setDate(a.getDate()+(a<d?1:-1))}return a}function ba(a,b,e){if(+a){b=a.getDate()+b;var d=N(a);d.setHours(9);d.setDate(b);a.setDate(b);e||Ka(a);lb(a,d)}return a}function lb(a,b){if(+a)for(;a.getDate()!=b.getDate();)a.setTime(+a+(a<b?1:-1)*cc)}function xa(a,b){a.setMinutes(a.getMinutes()+b);return a}function Ka(a){a.setHours(0);a.setMinutes(0);a.setSeconds(0);a.setMilliseconds(0);return a}function N(a,b){if(b)return Ka(new Date(+a));return new Date(+a)}function zb(){var a=0,b;do b=new Date(1970,
+a++,1);while(b.getHours());return b}function Fa(a,b,e){for(b=b||1;!a.getDay()||e&&a.getDay()==1||!e&&a.getDay()==6;)ba(a,b);return a}function Ca(a,b){return Math.round((N(a,true)-N(b,true))/Ab)}function yb(a,b,e,d){if(b!==ma&&b!=a.getFullYear()){a.setDate(1);a.setMonth(0);a.setFullYear(b)}if(e!==ma&&e!=a.getMonth()){a.setDate(1);a.setMonth(e)}d!==ma&&a.setDate(d)}function kb(a,b){if(typeof a=="object")return a;if(typeof a=="number")return new Date(a*1E3);if(typeof a=="string"){if(a.match(/^\d+(\.\d+)?$/))return new Date(parseFloat(a)*
+1E3);if(b===ma)b=true;return Bb(a,b)||(a?new Date(a):null)}return null}function Bb(a,b){a=a.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);if(!a)return null;var e=new Date(a[1],0,1);if(b||!a[13]){b=new Date(a[1],0,1,9,0);if(a[3]){e.setMonth(a[3]-1);b.setMonth(a[3]-1)}if(a[5]){e.setDate(a[5]);b.setDate(a[5])}lb(e,b);a[7]&&e.setHours(a[7]);a[8]&&e.setMinutes(a[8]);a[10]&&e.setSeconds(a[10]);a[12]&&e.setMilliseconds(Number("0."+
+a[12])*1E3);lb(e,b)}else{e.setUTCFullYear(a[1],a[3]?a[3]-1:0,a[5]||1);e.setUTCHours(a[7]||0,a[8]||0,a[10]||0,a[12]?Number("0."+a[12])*1E3:0);if(a[14]){b=Number(a[16])*60+(a[18]?Number(a[18]):0);b*=a[15]=="-"?1:-1;e=new Date(+e+b*60*1E3)}}return e}function mb(a){if(typeof a=="number")return a*60;if(typeof a=="object")return a.getHours()*60+a.getMinutes();if(a=a.match(/(\d+)(?::(\d+))?\s*(\w+)?/)){var b=parseInt(a[1],10);if(a[3]){b%=12;if(a[3].toLowerCase().charAt(0)=="p")b+=12}return b*60+(a[2]?parseInt(a[2],
+10):0)}}function Oa(a,b,e){return ib(a,null,b,e)}function ib(a,b,e,d){d=d||Ya;var f=a,g=b,l,j=e.length,t,y,S,Q="";for(l=0;l<j;l++){t=e.charAt(l);if(t=="'")for(y=l+1;y<j;y++){if(e.charAt(y)=="'"){if(f){Q+=y==l+1?"'":e.substring(l+1,y);l=y}break}}else if(t=="(")for(y=l+1;y<j;y++){if(e.charAt(y)==")"){l=Oa(f,e.substring(l+1,y),d);if(parseInt(l.replace(/\D/,""),10))Q+=l;l=y;break}}else if(t=="[")for(y=l+1;y<j;y++){if(e.charAt(y)=="]"){t=e.substring(l+1,y);l=Oa(f,t,d);if(l!=Oa(g,t,d))Q+=l;l=y;break}}else if(t==
+"{"){f=b;g=a}else if(t=="}"){f=a;g=b}else{for(y=j;y>l;y--)if(S=dc[e.substring(l,y)]){if(f)Q+=S(f,d);l=y-1;break}if(y==l)if(f)Q+=t}}return Q}function Ua(a){return a.end?ec(a.end,a.allDay):ba(N(a.start),1)}function ec(a,b){a=N(a);return b||a.getHours()||a.getMinutes()?ba(a,1):Ka(a)}function fc(a,b){return(b.msLength-a.msLength)*100+(a.event.start-b.event.start)}function Cb(a,b){return a.end>b.start&&a.start<b.end}function nb(a,b,e,d){var f=[],g,l=a.length,j,t,y,S,Q;for(g=0;g<l;g++){j=a[g];t=j.start;
+y=b[g];if(y>e&&t<d){if(t<e){t=N(e);S=false}else{t=t;S=true}if(y>d){y=N(d);Q=false}else{y=y;Q=true}f.push({event:j,start:t,end:y,isStart:S,isEnd:Q,msLength:y-t})}}return f.sort(fc)}function ob(a){var b=[],e,d=a.length,f,g,l,j;for(e=0;e<d;e++){f=a[e];for(g=0;;){l=false;if(b[g])for(j=0;j<b[g].length;j++)if(Cb(b[g][j],f)){l=true;break}if(l)g++;else break}if(b[g])b[g].push(f);else b[g]=[f]}return b}function Db(a,b,e){a.unbind("mouseover").mouseover(function(d){for(var f=d.target,g;f!=this;){g=f;f=f.parentNode}if((f=
+g._fci)!==ma){g._fci=ma;g=b[f];e(g.event,g.element,g);m(d.target).trigger(d)}d.stopPropagation()})}function Va(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.width(Math.max(0,b-pb(f,e)))}}function Eb(a,b,e){for(var d=0,f;d<a.length;d++){f=m(a[d]);f.height(Math.max(0,b-Sa(f,e)))}}function pb(a,b){return gc(a)+hc(a)+(b?ic(a):0)}function gc(a){return(parseFloat(m.curCSS(a[0],"paddingLeft",true))||0)+(parseFloat(m.curCSS(a[0],"paddingRight",true))||0)}function ic(a){return(parseFloat(m.curCSS(a[0],
+"marginLeft",true))||0)+(parseFloat(m.curCSS(a[0],"marginRight",true))||0)}function hc(a){return(parseFloat(m.curCSS(a[0],"borderLeftWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderRightWidth",true))||0)}function Sa(a,b){return jc(a)+kc(a)+(b?Fb(a):0)}function jc(a){return(parseFloat(m.curCSS(a[0],"paddingTop",true))||0)+(parseFloat(m.curCSS(a[0],"paddingBottom",true))||0)}function Fb(a){return(parseFloat(m.curCSS(a[0],"marginTop",true))||0)+(parseFloat(m.curCSS(a[0],"marginBottom",true))||0)}
+function kc(a){return(parseFloat(m.curCSS(a[0],"borderTopWidth",true))||0)+(parseFloat(m.curCSS(a[0],"borderBottomWidth",true))||0)}function Za(a,b){b=typeof b=="number"?b+"px":b;a.each(function(e,d){d.style.cssText+=";min-height:"+b+";_height:"+b})}function xb(){}function Gb(a,b){return a-b}function Hb(a){return Math.max.apply(Math,a)}function Pa(a){return(a<10?"0":"")+a}function jb(a,b){if(a[b]!==ma)return a[b];b=b.split(/(?=[A-Z])/);for(var e=b.length-1,d;e>=0;e--){d=a[b[e].toLowerCase()];if(d!==
+ma)return d}return a[""]}function Qa(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#039;").replace(/"/g,"&quot;").replace(/\n/g,"<br />")}function Ib(a){return a.id+"/"+a.className+"/"+a.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig,"")}function qb(a){a.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})}function ab(a){a.children().removeClass("fc-first fc-last").filter(":first-child").addClass("fc-first").end().filter(":last-child").addClass("fc-last")}
+function rb(a,b){a.each(function(e,d){d.className=d.className.replace(/^fc-\w*/,"fc-"+lc[b.getDay()])})}function Jb(a,b){var e=a.source||{},d=a.color,f=e.color,g=b("eventColor"),l=a.backgroundColor||d||e.backgroundColor||f||b("eventBackgroundColor")||g;d=a.borderColor||d||e.borderColor||f||b("eventBorderColor")||g;a=a.textColor||e.textColor||b("eventTextColor");b=[];l&&b.push("background-color:"+l);d&&b.push("border-color:"+d);a&&b.push("color:"+a);return b.join(";")}function $a(a,b,e){if(m.isFunction(a))a=
+[a];if(a){var d,f;for(d=0;d<a.length;d++)f=a[d].apply(b,e)||f;return f}}function Ta(){for(var a=0;a<arguments.length;a++)if(arguments[a]!==ma)return arguments[a]}function mc(a,b){function e(j,t){if(t){hb(j,t);j.setDate(1)}j=N(j,true);j.setDate(1);t=hb(N(j),1);var y=N(j),S=N(t),Q=f("firstDay"),q=f("weekends")?0:1;if(q){Fa(y);Fa(S,-1,true)}ba(y,-((y.getDay()-Math.max(Q,q)+7)%7));ba(S,(7-S.getDay()+Math.max(Q,q))%7);Q=Math.round((S-y)/(Ab*7));if(f("weekMode")=="fixed"){ba(S,(6-Q)*7);Q=6}d.title=l(j,
+f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(6,Q,q?5:7,true)}var d=this;d.render=e;sb.call(d,a,b,"month");var f=d.opt,g=d.renderBasic,l=b.formatDate}function nc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(1,1,Q?7:5,false)}var d=this;d.render=e;sb.call(d,a,b,"basicWeek");var f=d.opt,g=d.renderBasic,
+l=b.formatDates}function oc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}d.title=l(j,f("titleFormat"));d.start=d.visStart=N(j,true);d.end=d.visEnd=ba(N(d.start),1);g(1,1,1,false)}var d=this;d.render=e;sb.call(d,a,b,"basicDay");var f=d.opt,g=d.renderBasic,l=b.formatDate}function sb(a,b,e){function d(w,I,R,V){v=I;F=R;f();(I=!C)?g(w,V):z();l(I)}function f(){if(k=L("isRTL")){D=-1;Z=F-1}else{D=1;Z=0}ja=L("firstDay");ia=L("weekends")?0:1;la=L("theme")?"ui":"fc";$=L("columnFormat")}function g(w,
+I){var R,V=la+"-widget-header",ea=la+"-widget-content",aa;R="<table class='fc-border-separate' style='width:100%' cellspacing='0'><thead><tr>";for(aa=0;aa<F;aa++)R+="<th class='fc- "+V+"'/>";R+="</tr></thead><tbody>";for(aa=0;aa<w;aa++){R+="<tr class='fc-week"+aa+"'>";for(V=0;V<F;V++)R+="<td class='fc- "+ea+" fc-day"+(aa*F+V)+"'><div>"+(I?"<div class='fc-day-number'/>":"")+"<div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";R+="</tr>"}R+="</tbody></table>";w=
+m(R).appendTo(a);K=w.find("thead");i=K.find("th");C=w.find("tbody");P=C.find("tr");E=C.find("td");B=E.filter(":first-child");n=P.eq(0).find("div.fc-day-content div");ab(K.add(K.find("tr")));ab(P);P.eq(0).addClass("fc-first");y(E);Y=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(a)}function l(w){var I=w||v==1,R=p.start.getMonth(),V=Ka(new Date),ea,aa,va;I&&i.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);ea.html(ya(aa,$));rb(ea,aa)});E.each(function(wa,Ga){ea=m(Ga);aa=ca(wa);aa.getMonth()==
+R?ea.removeClass("fc-other-month"):ea.addClass("fc-other-month");+aa==+V?ea.addClass(la+"-state-highlight fc-today"):ea.removeClass(la+"-state-highlight fc-today");ea.find("div.fc-day-number").text(aa.getDate());I&&rb(ea,aa)});P.each(function(wa,Ga){va=m(Ga);if(wa<v){va.show();wa==v-1?va.addClass("fc-last"):va.removeClass("fc-last")}else va.hide()})}function j(w){o=w;w=o-K.height();var I,R,V;if(L("weekMode")=="variable")I=R=Math.floor(w/(v==1?2:6));else{I=Math.floor(w/v);R=w-I*(v-1)}B.each(function(ea,
+aa){if(ea<v){V=m(aa);Za(V.find("> div"),(ea==v-1?R:I)-Sa(V))}})}function t(w){W=w;M.clear();s=Math.floor(W/F);Va(i.slice(0,-1),s)}function y(w){w.click(S).mousedown(X)}function S(w){if(!L("selectable")){var I=parseInt(this.className.match(/fc\-day(\d+)/)[1]);I=ca(I);c("dayClick",this,I,true,w)}}function Q(w,I,R){R&&r.build();R=N(p.visStart);for(var V=ba(N(R),F),ea=0;ea<v;ea++){var aa=new Date(Math.max(R,w)),va=new Date(Math.min(V,I));if(aa<va){var wa;if(k){wa=Ca(va,R)*D+Z+1;aa=Ca(aa,R)*D+Z+1}else{wa=
+Ca(aa,R);aa=Ca(va,R)}y(q(ea,wa,ea,aa-1))}ba(R,7);ba(V,7)}}function q(w,I,R,V){w=r.rect(w,I,R,V,a);return H(w,a)}function u(w){return N(w)}function fa(w,I){Q(w,ba(N(I),1),true)}function oa(){T()}function ga(w,I,R){var V=ua(w);c("dayClick",E[V.row*F+V.col],w,I,R)}function ra(w,I){J.start(function(R){T();R&&q(R.row,R.col,R.row,R.col)},I)}function sa(w,I,R){var V=J.stop();T();if(V){V=pa(V);c("drop",w,V,true,I,R)}}function ha(w){return N(w.start)}function da(w){return M.left(w)}function na(w){return M.right(w)}
+function ua(w){return{row:Math.floor(Ca(w,p.visStart)/7),col:ka(w.getDay())}}function pa(w){return U(w.row,w.col)}function U(w,I){return ba(N(p.visStart),w*7+I*D+Z)}function ca(w){return U(Math.floor(w/F),w%F)}function ka(w){return(w-Math.max(ja,ia)+F)%F*D+Z}function qa(w){return P.eq(w)}function G(){return{left:0,right:W}}var p=this;p.renderBasic=d;p.setHeight=j;p.setWidth=t;p.renderDayOverlay=Q;p.defaultSelectionEnd=u;p.renderSelection=fa;p.clearSelection=oa;p.reportDayClick=ga;p.dragStart=ra;p.dragStop=
+sa;p.defaultEventEnd=ha;p.getHoverListener=function(){return J};p.colContentLeft=da;p.colContentRight=na;p.dayOfWeekCol=ka;p.dateCell=ua;p.cellDate=pa;p.cellIsAllDay=function(){return true};p.allDayRow=qa;p.allDayBounds=G;p.getRowCnt=function(){return v};p.getColCnt=function(){return F};p.getColWidth=function(){return s};p.getDaySegmentContainer=function(){return Y};Kb.call(p,a,b,e);Lb.call(p);Mb.call(p);pc.call(p);var L=p.opt,c=p.trigger,z=p.clearEvents,H=p.renderOverlay,T=p.clearOverlays,X=p.daySelectionMousedown,
+ya=b.formatDate,K,i,C,P,E,B,n,Y,W,o,s,v,F,r,J,M,k,D,Z,ja,ia,la,$;qb(a.addClass("fc-grid"));r=new Nb(function(w,I){var R,V,ea;i.each(function(aa,va){R=m(va);V=R.offset().left;if(aa)ea[1]=V;ea=[V];I[aa]=ea});ea[1]=V+R.outerWidth();P.each(function(aa,va){if(aa<v){R=m(va);V=R.offset().top;if(aa)ea[1]=V;ea=[V];w[aa]=ea}});ea[1]=V+R.outerHeight()});J=new Ob(r);M=new Pb(function(w){return n.eq(w)})}function pc(){function a(U,ca){S(U);ua(e(U),ca)}function b(){Q();ga().empty()}function e(U){var ca=da(),ka=
+na(),qa=N(g.visStart);ka=ba(N(qa),ka);var G=m.map(U,Ua),p,L,c,z,H,T,X=[];for(p=0;p<ca;p++){L=ob(nb(U,G,qa,ka));for(c=0;c<L.length;c++){z=L[c];for(H=0;H<z.length;H++){T=z[H];T.row=p;T.level=c;X.push(T)}}ba(qa,7);ba(ka,7)}return X}function d(U,ca,ka){t(U)&&f(U,ca);ka.isEnd&&y(U)&&pa(U,ca,ka);q(U,ca)}function f(U,ca){var ka=ra(),qa;ca.draggable({zIndex:9,delay:50,opacity:l("dragOpacity"),revertDuration:l("dragRevertDuration"),start:function(G,p){j("eventDragStart",ca,U,G,p);fa(U,ca);ka.start(function(L,
+c,z,H){ca.draggable("option","revert",!L||!z&&!H);ha();if(L){qa=z*7+H*(l("isRTL")?-1:1);sa(ba(N(U.start),qa),ba(Ua(U),qa))}else qa=0},G,"drag")},stop:function(G,p){ka.stop();ha();j("eventDragStop",ca,U,G,p);if(qa)oa(this,U,qa,0,U.allDay,G,p);else{ca.css("filter","");u(U,ca)}}})}var g=this;g.renderEvents=a;g.compileDaySegs=e;g.clearEvents=b;g.bindDaySeg=d;Qb.call(g);var l=g.opt,j=g.trigger,t=g.isEventDraggable,y=g.isEventResizable,S=g.reportEvents,Q=g.reportEventClear,q=g.eventElementHandlers,u=g.showEvents,
+fa=g.hideEvents,oa=g.eventDrop,ga=g.getDaySegmentContainer,ra=g.getHoverListener,sa=g.renderDayOverlay,ha=g.clearOverlays,da=g.getRowCnt,na=g.getColCnt,ua=g.renderDaySegs,pa=g.resizableDayEvent}function qc(a,b){function e(j,t){t&&ba(j,t*7);j=ba(N(j),-((j.getDay()-f("firstDay")+7)%7));t=ba(N(j),7);var y=N(j),S=N(t),Q=f("weekends");if(!Q){Fa(y);Fa(S,-1,true)}d.title=l(y,ba(N(S),-1),f("titleFormat"));d.start=j;d.end=t;d.visStart=y;d.visEnd=S;g(Q?7:5)}var d=this;d.render=e;Rb.call(d,a,b,"agendaWeek");
+var f=d.opt,g=d.renderAgenda,l=b.formatDates}function rc(a,b){function e(j,t){if(t){ba(j,t);f("weekends")||Fa(j,t<0?-1:1)}t=N(j,true);var y=ba(N(t),1);d.title=l(j,f("titleFormat"));d.start=d.visStart=t;d.end=d.visEnd=y;g(1)}var d=this;d.render=e;Rb.call(d,a,b,"agendaDay");var f=d.opt,g=d.renderAgenda,l=b.formatDate}function Rb(a,b,e){function d(h){Ba=h;f();v?P():g();l()}function f(){Wa=i("theme")?"ui":"fc";Sb=i("weekends")?0:1;Tb=i("firstDay");if(Ub=i("isRTL")){Ha=-1;Ia=Ba-1}else{Ha=1;Ia=0}La=mb(i("minTime"));
+bb=mb(i("maxTime"));Vb=i("columnFormat")}function g(){var h=Wa+"-widget-header",O=Wa+"-widget-content",x,A,ta,za,Da,Ea=i("slotMinutes")%15==0;x="<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'><thead><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<th class='fc- fc-col"+A+" "+h+"'/>";x+="<th class='fc-agenda-gutter "+h+"'>&nbsp;</th></tr></thead><tbody><tr><th class='fc-agenda-axis "+h+"'>&nbsp;</th>";for(A=0;A<Ba;A++)x+="<td class='fc- fc-col"+
+A+" "+O+"'><div><div class='fc-day-content'><div style='position:relative'>&nbsp;</div></div></div></td>";x+="<td class='fc-agenda-gutter "+O+"'>&nbsp;</td></tr></tbody></table>";v=m(x).appendTo(a);F=v.find("thead");r=F.find("th").slice(1,-1);J=v.find("tbody");M=J.find("td").slice(0,-1);k=M.find("div.fc-day-content div");D=M.eq(0);Z=D.find("> div");ab(F.add(F.find("tr")));ab(J.add(J.find("tr")));aa=F.find("th:first");va=v.find(".fc-agenda-gutter");ja=m("<div style='position:absolute;z-index:2;left:0;width:100%'/>").appendTo(a);
+if(i("allDaySlot")){ia=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(ja);x="<table style='width:100%' class='fc-agenda-allday' cellspacing='0'><tr><th class='"+h+" fc-agenda-axis'>"+i("allDayText")+"</th><td><div class='fc-day-content'><div style='position:relative'/></div></td><th class='"+h+" fc-agenda-gutter'>&nbsp;</th></tr></table>";la=m(x).appendTo(ja);$=la.find("tr");q($.find("td"));aa=aa.add(la.find("th:first"));va=va.add(la.find("th.fc-agenda-gutter"));ja.append("<div class='fc-agenda-divider "+
+h+"'><div class='fc-agenda-divider-inner'/></div>")}else ia=m([]);w=m("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>").appendTo(ja);I=m("<div style='position:relative;width:100%;overflow:hidden'/>").appendTo(w);R=m("<div style='position:absolute;z-index:8;top:0;left:0'/>").appendTo(I);x="<table class='fc-agenda-slots' style='width:100%' cellspacing='0'><tbody>";ta=zb();za=xa(N(ta),bb);xa(ta,La);for(A=tb=0;ta<za;A++){Da=ta.getMinutes();x+="<tr class='fc-slot"+A+" "+
+(!Da?"":"fc-minor")+"'><th class='fc-agenda-axis "+h+"'>"+(!Ea||!Da?s(ta,i("axisFormat")):"&nbsp;")+"</th><td class='"+O+"'><div style='position:relative'>&nbsp;</div></td></tr>";xa(ta,i("slotMinutes"));tb++}x+="</tbody></table>";V=m(x).appendTo(I);ea=V.find("div:first");u(V.find("td"));aa=aa.add(V.find("th:first"))}function l(){var h,O,x,A,ta=Ka(new Date);for(h=0;h<Ba;h++){A=ua(h);O=r.eq(h);O.html(s(A,Vb));x=M.eq(h);+A==+ta?x.addClass(Wa+"-state-highlight fc-today"):x.removeClass(Wa+"-state-highlight fc-today");
+rb(O.add(x),A)}}function j(h,O){if(h===ma)h=Wb;Wb=h;ub={};var x=J.position().top,A=w.position().top;h=Math.min(h-x,V.height()+A+1);Z.height(h-Sa(D));ja.css("top",x);w.height(h-A-1);Xa=ea.height()+1;O&&y()}function t(h){Ga=h;cb.clear();Ma=0;Va(aa.width("").each(function(O,x){Ma=Math.max(Ma,m(x).outerWidth())}),Ma);h=w[0].clientWidth;if(vb=w.width()-h){Va(va,vb);va.show().prev().removeClass("fc-last")}else va.hide().prev().addClass("fc-last");db=Math.floor((h-Ma)/Ba);Va(r.slice(0,-1),db)}function y(){function h(){w.scrollTop(A)}
+var O=zb(),x=N(O);x.setHours(i("firstHour"));var A=ca(O,x)+1;h();setTimeout(h,0)}function S(){Xb=w.scrollTop()}function Q(){w.scrollTop(Xb)}function q(h){h.click(fa).mousedown(W)}function u(h){h.click(fa).mousedown(H)}function fa(h){if(!i("selectable")){var O=Math.min(Ba-1,Math.floor((h.pageX-v.offset().left-Ma)/db)),x=ua(O),A=this.parentNode.className.match(/fc-slot(\d+)/);if(A){A=parseInt(A[1])*i("slotMinutes");var ta=Math.floor(A/60);x.setHours(ta);x.setMinutes(A%60+La);C("dayClick",M[O],x,false,
+h)}else C("dayClick",M[O],x,true,h)}}function oa(h,O,x){x&&Na.build();var A=N(K.visStart);if(Ub){x=Ca(O,A)*Ha+Ia+1;h=Ca(h,A)*Ha+Ia+1}else{x=Ca(h,A);h=Ca(O,A)}x=Math.max(0,x);h=Math.min(Ba,h);x<h&&q(ga(0,x,0,h-1))}function ga(h,O,x,A){h=Na.rect(h,O,x,A,ja);return E(h,ja)}function ra(h,O){for(var x=N(K.visStart),A=ba(N(x),1),ta=0;ta<Ba;ta++){var za=new Date(Math.max(x,h)),Da=new Date(Math.min(A,O));if(za<Da){var Ea=ta*Ha+Ia;Ea=Na.rect(0,Ea,0,Ea,I);za=ca(x,za);Da=ca(x,Da);Ea.top=za;Ea.height=Da-za;u(E(Ea,
+I))}ba(x,1);ba(A,1)}}function sa(h){return cb.left(h)}function ha(h){return cb.right(h)}function da(h){return{row:Math.floor(Ca(h,K.visStart)/7),col:U(h.getDay())}}function na(h){var O=ua(h.col);h=h.row;i("allDaySlot")&&h--;h>=0&&xa(O,La+h*i("slotMinutes"));return O}function ua(h){return ba(N(K.visStart),h*Ha+Ia)}function pa(h){return i("allDaySlot")&&!h.row}function U(h){return(h-Math.max(Tb,Sb)+Ba)%Ba*Ha+Ia}function ca(h,O){h=N(h,true);if(O<xa(N(h),La))return 0;if(O>=xa(N(h),bb))return V.height();
+h=i("slotMinutes");O=O.getHours()*60+O.getMinutes()-La;var x=Math.floor(O/h),A=ub[x];if(A===ma)A=ub[x]=V.find("tr:eq("+x+") td div")[0].offsetTop;return Math.max(0,Math.round(A-1+Xa*(O%h/h)))}function ka(){return{left:Ma,right:Ga-vb}}function qa(){return $}function G(h){var O=N(h.start);if(h.allDay)return O;return xa(O,i("defaultEventMinutes"))}function p(h,O){if(O)return N(h);return xa(N(h),i("slotMinutes"))}function L(h,O,x){if(x)i("allDaySlot")&&oa(h,ba(N(O),1),true);else c(h,O)}function c(h,O){var x=
+i("selectHelper");Na.build();if(x){var A=Ca(h,K.visStart)*Ha+Ia;if(A>=0&&A<Ba){A=Na.rect(0,A,0,A,I);var ta=ca(h,h),za=ca(h,O);if(za>ta){A.top=ta;A.height=za-ta;A.left+=2;A.width-=5;if(m.isFunction(x)){if(h=x(h,O)){A.position="absolute";A.zIndex=8;wa=m(h).css(A).appendTo(I)}}else{A.isStart=true;A.isEnd=true;wa=m(o({title:"",start:h,end:O,className:["fc-select-helper"],editable:false},A));wa.css("opacity",i("dragOpacity"))}if(wa){u(wa);I.append(wa);Va(wa,A.width,true);Eb(wa,A.height,true)}}}}else ra(h,
+O)}function z(){B();if(wa){wa.remove();wa=null}}function H(h){if(h.which==1&&i("selectable")){Y(h);var O;Ra.start(function(x,A){z();if(x&&x.col==A.col&&!pa(x)){A=na(A);x=na(x);O=[A,xa(N(A),i("slotMinutes")),x,xa(N(x),i("slotMinutes"))].sort(Gb);c(O[0],O[3])}else O=null},h);m(document).one("mouseup",function(x){Ra.stop();if(O){+O[0]==+O[1]&&T(O[0],false,x);n(O[0],O[3],false,x)}})}}function T(h,O,x){C("dayClick",M[U(h.getDay())],h,O,x)}function X(h,O){Ra.start(function(x){B();if(x)if(pa(x))ga(x.row,
+x.col,x.row,x.col);else{x=na(x);var A=xa(N(x),i("defaultEventMinutes"));ra(x,A)}},O)}function ya(h,O,x){var A=Ra.stop();B();A&&C("drop",h,na(A),pa(A),O,x)}var K=this;K.renderAgenda=d;K.setWidth=t;K.setHeight=j;K.beforeHide=S;K.afterShow=Q;K.defaultEventEnd=G;K.timePosition=ca;K.dayOfWeekCol=U;K.dateCell=da;K.cellDate=na;K.cellIsAllDay=pa;K.allDayRow=qa;K.allDayBounds=ka;K.getHoverListener=function(){return Ra};K.colContentLeft=sa;K.colContentRight=ha;K.getDaySegmentContainer=function(){return ia};
+K.getSlotSegmentContainer=function(){return R};K.getMinMinute=function(){return La};K.getMaxMinute=function(){return bb};K.getBodyContent=function(){return I};K.getRowCnt=function(){return 1};K.getColCnt=function(){return Ba};K.getColWidth=function(){return db};K.getSlotHeight=function(){return Xa};K.defaultSelectionEnd=p;K.renderDayOverlay=oa;K.renderSelection=L;K.clearSelection=z;K.reportDayClick=T;K.dragStart=X;K.dragStop=ya;Kb.call(K,a,b,e);Lb.call(K);Mb.call(K);sc.call(K);var i=K.opt,C=K.trigger,
+P=K.clearEvents,E=K.renderOverlay,B=K.clearOverlays,n=K.reportSelection,Y=K.unselect,W=K.daySelectionMousedown,o=K.slotSegHtml,s=b.formatDate,v,F,r,J,M,k,D,Z,ja,ia,la,$,w,I,R,V,ea,aa,va,wa,Ga,Wb,Ma,db,vb,Xa,Xb,Ba,tb,Na,Ra,cb,ub={},Wa,Tb,Sb,Ub,Ha,Ia,La,bb,Vb;qb(a.addClass("fc-agenda"));Na=new Nb(function(h,O){function x(eb){return Math.max(Ea,Math.min(tc,eb))}var A,ta,za;r.each(function(eb,uc){A=m(uc);ta=A.offset().left;if(eb)za[1]=ta;za=[ta];O[eb]=za});za[1]=ta+A.outerWidth();if(i("allDaySlot")){A=
+$;ta=A.offset().top;h[0]=[ta,ta+A.outerHeight()]}for(var Da=I.offset().top,Ea=w.offset().top,tc=Ea+w.outerHeight(),fb=0;fb<tb;fb++)h.push([x(Da+Xa*fb),x(Da+Xa*(fb+1))])});Ra=new Ob(Na);cb=new Pb(function(h){return k.eq(h)})}function sc(){function a(o,s){sa(o);var v,F=o.length,r=[],J=[];for(v=0;v<F;v++)o[v].allDay?r.push(o[v]):J.push(o[v]);if(u("allDaySlot")){L(e(r),s);na()}g(d(J),s)}function b(){ha();ua().empty();pa().empty()}function e(o){o=ob(nb(o,m.map(o,Ua),q.visStart,q.visEnd));var s,v=o.length,
+F,r,J,M=[];for(s=0;s<v;s++){F=o[s];for(r=0;r<F.length;r++){J=F[r];J.row=0;J.level=s;M.push(J)}}return M}function d(o){var s=z(),v=ka(),F=ca(),r=xa(N(q.visStart),v),J=m.map(o,f),M,k,D,Z,ja,ia,la=[];for(M=0;M<s;M++){k=ob(nb(o,J,r,xa(N(r),F-v)));vc(k);for(D=0;D<k.length;D++){Z=k[D];for(ja=0;ja<Z.length;ja++){ia=Z[ja];ia.col=M;ia.level=D;la.push(ia)}}ba(r,1,true)}return la}function f(o){return o.end?N(o.end):xa(N(o.start),u("defaultEventMinutes"))}function g(o,s){var v,F=o.length,r,J,M,k,D,Z,ja,ia,la,
+$="",w,I,R={},V={},ea=pa(),aa;v=z();if(w=u("isRTL")){I=-1;aa=v-1}else{I=1;aa=0}for(v=0;v<F;v++){r=o[v];J=r.event;M=qa(r.start,r.start);k=qa(r.start,r.end);D=r.col;Z=r.level;ja=r.forward||0;ia=G(D*I+aa);la=p(D*I+aa)-ia;la=Math.min(la-6,la*0.95);D=Z?la/(Z+ja+1):ja?(la/(ja+1)-6)*2:la;Z=ia+la/(Z+ja+1)*Z*I+(w?la-D:0);r.top=M;r.left=Z;r.outerWidth=D;r.outerHeight=k-M;$+=l(J,r)}ea[0].innerHTML=$;w=ea.children();for(v=0;v<F;v++){r=o[v];J=r.event;$=m(w[v]);I=fa("eventRender",J,J,$);if(I===false)$.remove();
+else{if(I&&I!==true){$.remove();$=m(I).css({position:"absolute",top:r.top,left:r.left}).appendTo(ea)}r.element=$;if(J._id===s)t(J,$,r);else $[0]._fci=v;ya(J,$)}}Db(ea,o,t);for(v=0;v<F;v++){r=o[v];if($=r.element){J=R[s=r.key=Ib($[0])];r.vsides=J===ma?(R[s]=Sa($,true)):J;J=V[s];r.hsides=J===ma?(V[s]=pb($,true)):J;s=$.find("div.fc-event-content");if(s.length)r.contentTop=s[0].offsetTop}}for(v=0;v<F;v++){r=o[v];if($=r.element){$[0].style.width=Math.max(0,r.outerWidth-r.hsides)+"px";R=Math.max(0,r.outerHeight-
+r.vsides);$[0].style.height=R+"px";J=r.event;if(r.contentTop!==ma&&R-r.contentTop<10){$.find("div.fc-event-time").text(Y(J.start,u("timeFormat"))+" - "+J.title);$.find("div.fc-event-title").remove()}fa("eventAfterRender",J,J,$)}}}function l(o,s){var v="<",F=o.url,r=Jb(o,u),J=r?" style='"+r+"'":"",M=["fc-event","fc-event-skin","fc-event-vert"];oa(o)&&M.push("fc-event-draggable");s.isStart&&M.push("fc-corner-top");s.isEnd&&M.push("fc-corner-bottom");M=M.concat(o.className);if(o.source)M=M.concat(o.source.className||
+[]);v+=F?"a href='"+Qa(o.url)+"'":"div";v+=" class='"+M.join(" ")+"' style='position:absolute;z-index:8;top:"+s.top+"px;left:"+s.left+"px;"+r+"'><div class='fc-event-inner fc-event-skin'"+J+"><div class='fc-event-head fc-event-skin'"+J+"><div class='fc-event-time'>"+Qa(W(o.start,o.end,u("timeFormat")))+"</div></div><div class='fc-event-content'><div class='fc-event-title'>"+Qa(o.title)+"</div></div><div class='fc-event-bg'></div></div>";if(s.isEnd&&ga(o))v+="<div class='ui-resizable-handle ui-resizable-s'>=</div>";
+v+="</"+(F?"a":"div")+">";return v}function j(o,s,v){oa(o)&&y(o,s,v.isStart);v.isEnd&&ga(o)&&c(o,s,v);da(o,s)}function t(o,s,v){var F=s.find("div.fc-event-time");oa(o)&&S(o,s,F);v.isEnd&&ga(o)&&Q(o,s,F);da(o,s)}function y(o,s,v){function F(){if(!M){s.width(r).height("").draggable("option","grid",null);M=true}}var r,J,M=true,k,D=u("isRTL")?-1:1,Z=U(),ja=H(),ia=T(),la=ka();s.draggable({zIndex:9,opacity:u("dragOpacity","month"),revertDuration:u("dragRevertDuration"),start:function($,w){fa("eventDragStart",
+s,o,$,w);i(o,s);r=s.width();Z.start(function(I,R,V,ea){B();if(I){J=false;k=ea*D;if(I.row)if(v){if(M){s.width(ja-10);Eb(s,ia*Math.round((o.end?(o.end-o.start)/wc:u("defaultEventMinutes"))/u("slotMinutes")));s.draggable("option","grid",[ja,1]);M=false}}else J=true;else{E(ba(N(o.start),k),ba(Ua(o),k));F()}J=J||M&&!k}else{F();J=true}s.draggable("option","revert",J)},$,"drag")},stop:function($,w){Z.stop();B();fa("eventDragStop",s,o,$,w);if(J){F();s.css("filter","");K(o,s)}else{var I=0;M||(I=Math.round((s.offset().top-
+X().offset().top)/ia)*u("slotMinutes")+la-(o.start.getHours()*60+o.start.getMinutes()));C(this,o,k,I,M,$,w)}}})}function S(o,s,v){function F(I){var R=xa(N(o.start),I),V;if(o.end)V=xa(N(o.end),I);v.text(W(R,V,u("timeFormat")))}function r(){if(M){v.css("display","");s.draggable("option","grid",[$,w]);M=false}}var J,M=false,k,D,Z,ja=u("isRTL")?-1:1,ia=U(),la=z(),$=H(),w=T();s.draggable({zIndex:9,scroll:false,grid:[$,w],axis:la==1?"y":false,opacity:u("dragOpacity"),revertDuration:u("dragRevertDuration"),
+start:function(I,R){fa("eventDragStart",s,o,I,R);i(o,s);J=s.position();D=Z=0;ia.start(function(V,ea,aa,va){s.draggable("option","revert",!V);B();if(V){k=va*ja;if(u("allDaySlot")&&!V.row){if(!M){M=true;v.hide();s.draggable("option","grid",null)}E(ba(N(o.start),k),ba(Ua(o),k))}else r()}},I,"drag")},drag:function(I,R){D=Math.round((R.position.top-J.top)/w)*u("slotMinutes");if(D!=Z){M||F(D);Z=D}},stop:function(I,R){var V=ia.stop();B();fa("eventDragStop",s,o,I,R);if(V&&(k||D||M))C(this,o,k,M?0:D,M,I,R);
+else{r();s.css("filter","");s.css(J);F(0);K(o,s)}}})}function Q(o,s,v){var F,r,J=T();s.resizable({handles:{s:"div.ui-resizable-s"},grid:J,start:function(M,k){F=r=0;i(o,s);s.css("z-index",9);fa("eventResizeStart",this,o,M,k)},resize:function(M,k){F=Math.round((Math.max(J,s.height())-k.originalSize.height)/J);if(F!=r){v.text(W(o.start,!F&&!o.end?null:xa(ra(o),u("slotMinutes")*F),u("timeFormat")));r=F}},stop:function(M,k){fa("eventResizeStop",this,o,M,k);if(F)P(this,o,0,u("slotMinutes")*F,M,k);else{s.css("z-index",
+8);K(o,s)}}})}var q=this;q.renderEvents=a;q.compileDaySegs=e;q.clearEvents=b;q.slotSegHtml=l;q.bindDaySeg=j;Qb.call(q);var u=q.opt,fa=q.trigger,oa=q.isEventDraggable,ga=q.isEventResizable,ra=q.eventEnd,sa=q.reportEvents,ha=q.reportEventClear,da=q.eventElementHandlers,na=q.setHeight,ua=q.getDaySegmentContainer,pa=q.getSlotSegmentContainer,U=q.getHoverListener,ca=q.getMaxMinute,ka=q.getMinMinute,qa=q.timePosition,G=q.colContentLeft,p=q.colContentRight,L=q.renderDaySegs,c=q.resizableDayEvent,z=q.getColCnt,
+H=q.getColWidth,T=q.getSlotHeight,X=q.getBodyContent,ya=q.reportEventElement,K=q.showEvents,i=q.hideEvents,C=q.eventDrop,P=q.eventResize,E=q.renderDayOverlay,B=q.clearOverlays,n=q.calendar,Y=n.formatDate,W=n.formatDates}function vc(a){var b,e,d,f,g,l;for(b=a.length-1;b>0;b--){f=a[b];for(e=0;e<f.length;e++){g=f[e];for(d=0;d<a[b-1].length;d++){l=a[b-1][d];if(Cb(g,l))l.forward=Math.max(l.forward||0,(g.forward||0)+1)}}}}function Kb(a,b,e){function d(G,p){G=qa[G];if(typeof G=="object")return jb(G,p||e);
+return G}function f(G,p){return b.trigger.apply(b,[G,p||da].concat(Array.prototype.slice.call(arguments,2),[da]))}function g(G){return j(G)&&!d("disableDragging")}function l(G){return j(G)&&!d("disableResizing")}function j(G){return Ta(G.editable,(G.source||{}).editable,d("editable"))}function t(G){U={};var p,L=G.length,c;for(p=0;p<L;p++){c=G[p];if(U[c._id])U[c._id].push(c);else U[c._id]=[c]}}function y(G){return G.end?N(G.end):na(G)}function S(G,p){ca.push(p);if(ka[G._id])ka[G._id].push(p);else ka[G._id]=
+[p]}function Q(){ca=[];ka={}}function q(G,p){p.click(function(L){if(!p.hasClass("ui-draggable-dragging")&&!p.hasClass("ui-resizable-resizing"))return f("eventClick",this,G,L)}).hover(function(L){f("eventMouseover",this,G,L)},function(L){f("eventMouseout",this,G,L)})}function u(G,p){oa(G,p,"show")}function fa(G,p){oa(G,p,"hide")}function oa(G,p,L){G=ka[G._id];var c,z=G.length;for(c=0;c<z;c++)if(!p||G[c][0]!=p[0])G[c][L]()}function ga(G,p,L,c,z,H,T){var X=p.allDay,ya=p._id;sa(U[ya],L,c,z);f("eventDrop",
+G,p,L,c,z,function(){sa(U[ya],-L,-c,X);pa(ya)},H,T);pa(ya)}function ra(G,p,L,c,z,H){var T=p._id;ha(U[T],L,c);f("eventResize",G,p,L,c,function(){ha(U[T],-L,-c);pa(T)},z,H);pa(T)}function sa(G,p,L,c){L=L||0;for(var z,H=G.length,T=0;T<H;T++){z=G[T];if(c!==ma)z.allDay=c;xa(ba(z.start,p,true),L);if(z.end)z.end=xa(ba(z.end,p,true),L);ua(z,qa)}}function ha(G,p,L){L=L||0;for(var c,z=G.length,H=0;H<z;H++){c=G[H];c.end=xa(ba(y(c),p,true),L);ua(c,qa)}}var da=this;da.element=a;da.calendar=b;da.name=e;da.opt=
+d;da.trigger=f;da.isEventDraggable=g;da.isEventResizable=l;da.reportEvents=t;da.eventEnd=y;da.reportEventElement=S;da.reportEventClear=Q;da.eventElementHandlers=q;da.showEvents=u;da.hideEvents=fa;da.eventDrop=ga;da.eventResize=ra;var na=da.defaultEventEnd,ua=b.normalizeEvent,pa=b.reportEventChange,U={},ca=[],ka={},qa=b.options}function Qb(){function a(i,C){var P=z(),E=pa(),B=U(),n=0,Y,W,o=i.length,s,v;P[0].innerHTML=e(i);d(i,P.children());f(i);g(i,P,C);l(i);j(i);t(i);C=y();for(P=0;P<E;P++){Y=[];for(W=
+0;W<B;W++)Y[W]=0;for(;n<o&&(s=i[n]).row==P;){W=Hb(Y.slice(s.startCol,s.endCol));s.top=W;W+=s.outerHeight;for(v=s.startCol;v<s.endCol;v++)Y[v]=W;n++}C[P].height(Hb(Y))}Q(i,S(C))}function b(i,C,P){var E=m("<div/>"),B=z(),n=i.length,Y;E[0].innerHTML=e(i);E=E.children();B.append(E);d(i,E);l(i);j(i);t(i);Q(i,S(y()));E=[];for(B=0;B<n;B++)if(Y=i[B].element){i[B].row===C&&Y.css("top",P);E.push(Y[0])}return m(E)}function e(i){var C=fa("isRTL"),P,E=i.length,B,n,Y,W;P=ka();var o=P.left,s=P.right,v,F,r,J,M,k=
+"";for(P=0;P<E;P++){B=i[P];n=B.event;W=["fc-event","fc-event-skin","fc-event-hori"];ga(n)&&W.push("fc-event-draggable");if(C){B.isStart&&W.push("fc-corner-right");B.isEnd&&W.push("fc-corner-left");v=p(B.end.getDay()-1);F=p(B.start.getDay());r=B.isEnd?qa(v):o;J=B.isStart?G(F):s}else{B.isStart&&W.push("fc-corner-left");B.isEnd&&W.push("fc-corner-right");v=p(B.start.getDay());F=p(B.end.getDay()-1);r=B.isStart?qa(v):o;J=B.isEnd?G(F):s}W=W.concat(n.className);if(n.source)W=W.concat(n.source.className||
+[]);Y=n.url;M=Jb(n,fa);k+=Y?"<a href='"+Qa(Y)+"'":"<div";k+=" class='"+W.join(" ")+"' style='position:absolute;z-index:8;left:"+r+"px;"+M+"'><div class='fc-event-inner fc-event-skin'"+(M?" style='"+M+"'":"")+">";if(!n.allDay&&B.isStart)k+="<span class='fc-event-time'>"+Qa(T(n.start,n.end,fa("timeFormat")))+"</span>";k+="<span class='fc-event-title'>"+Qa(n.title)+"</span></div>";if(B.isEnd&&ra(n))k+="<div class='ui-resizable-handle ui-resizable-"+(C?"w":"e")+"'>&nbsp;&nbsp;&nbsp;</div>";k+="</"+(Y?
+"a":"div")+">";B.left=r;B.outerWidth=J-r;B.startCol=v;B.endCol=F+1}return k}function d(i,C){var P,E=i.length,B,n,Y;for(P=0;P<E;P++){B=i[P];n=B.event;Y=m(C[P]);n=oa("eventRender",n,n,Y);if(n===false)Y.remove();else{if(n&&n!==true){n=m(n).css({position:"absolute",left:B.left});Y.replaceWith(n);Y=n}B.element=Y}}}function f(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];(B=E.element)&&ha(E.event,B)}}function g(i,C,P){var E,B=i.length,n,Y,W;for(E=0;E<B;E++){n=i[E];if(Y=n.element){W=n.event;if(W._id===
+P)H(W,Y,n);else Y[0]._fci=E}}Db(C,i,H)}function l(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key=Ib(B[0]);Y=W[n];if(Y===ma)Y=W[n]=pb(B,true);E.hsides=Y}}}function j(i){var C,P=i.length,E,B;for(C=0;C<P;C++){E=i[C];if(B=E.element)B[0].style.width=Math.max(0,E.outerWidth-E.hsides)+"px"}}function t(i){var C,P=i.length,E,B,n,Y,W={};for(C=0;C<P;C++){E=i[C];if(B=E.element){n=E.key;Y=W[n];if(Y===ma)Y=W[n]=Fb(B);E.outerHeight=B[0].offsetHeight+Y}}}function y(){var i,C=pa(),
+P=[];for(i=0;i<C;i++)P[i]=ca(i).find("td:first div.fc-day-content > div");return P}function S(i){var C,P=i.length,E=[];for(C=0;C<P;C++)E[C]=i[C][0].offsetTop;return E}function Q(i,C){var P,E=i.length,B,n;for(P=0;P<E;P++){B=i[P];if(n=B.element){n[0].style.top=C[B.row]+(B.top||0)+"px";B=B.event;oa("eventAfterRender",B,B,n)}}}function q(i,C,P){var E=fa("isRTL"),B=E?"w":"e",n=C.find("div.ui-resizable-"+B),Y=false;qb(C);C.mousedown(function(W){W.preventDefault()}).click(function(W){if(Y){W.preventDefault();
+W.stopImmediatePropagation()}});n.mousedown(function(W){function o(ia){oa("eventResizeStop",this,i,ia);m("body").css("cursor","");s.stop();ya();k&&ua(this,i,k,0,ia);setTimeout(function(){Y=false},0)}if(W.which==1){Y=true;var s=u.getHoverListener(),v=pa(),F=U(),r=E?-1:1,J=E?F-1:0,M=C.css("top"),k,D,Z=m.extend({},i),ja=L(i.start);K();m("body").css("cursor",B+"-resize").one("mouseup",o);oa("eventResizeStart",this,i,W);s.start(function(ia,la){if(ia){var $=Math.max(ja.row,ia.row);ia=ia.col;if(v==1)$=0;
+if($==ja.row)ia=E?Math.min(ja.col,ia):Math.max(ja.col,ia);k=$*7+ia*r+J-(la.row*7+la.col*r+J);la=ba(sa(i),k,true);if(k){Z.end=la;$=D;D=b(c([Z]),P.row,M);D.find("*").css("cursor",B+"-resize");$&&$.remove();na(i)}else if(D){da(i);D.remove();D=null}ya();X(i.start,ba(N(la),1))}},W)}})}var u=this;u.renderDaySegs=a;u.resizableDayEvent=q;var fa=u.opt,oa=u.trigger,ga=u.isEventDraggable,ra=u.isEventResizable,sa=u.eventEnd,ha=u.reportEventElement,da=u.showEvents,na=u.hideEvents,ua=u.eventResize,pa=u.getRowCnt,
+U=u.getColCnt,ca=u.allDayRow,ka=u.allDayBounds,qa=u.colContentLeft,G=u.colContentRight,p=u.dayOfWeekCol,L=u.dateCell,c=u.compileDaySegs,z=u.getDaySegmentContainer,H=u.bindDaySeg,T=u.calendar.formatDates,X=u.renderDayOverlay,ya=u.clearOverlays,K=u.clearSelection}function Mb(){function a(Q,q,u){b();q||(q=j(Q,u));t(Q,q,u);e(Q,q,u)}function b(Q){if(S){S=false;y();l("unselect",null,Q)}}function e(Q,q,u,fa){S=true;l("select",null,Q,q,u,fa)}function d(Q){var q=f.cellDate,u=f.cellIsAllDay,fa=f.getHoverListener(),
+oa=f.reportDayClick;if(Q.which==1&&g("selectable")){b(Q);var ga;fa.start(function(ra,sa){y();if(ra&&u(ra)){ga=[q(sa),q(ra)].sort(Gb);t(ga[0],ga[1],true)}else ga=null},Q);m(document).one("mouseup",function(ra){fa.stop();if(ga){+ga[0]==+ga[1]&&oa(ga[0],true,ra);e(ga[0],ga[1],true,ra)}})}}var f=this;f.select=a;f.unselect=b;f.reportSelection=e;f.daySelectionMousedown=d;var g=f.opt,l=f.trigger,j=f.defaultSelectionEnd,t=f.renderSelection,y=f.clearSelection,S=false;g("selectable")&&g("unselectAuto")&&m(document).mousedown(function(Q){var q=
+g("unselectCancel");if(q)if(m(Q.target).parents(q).length)return;b(Q)})}function Lb(){function a(g,l){var j=f.shift();j||(j=m("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>"));j[0].parentNode!=l[0]&&j.appendTo(l);d.push(j.css(g).show());return j}function b(){for(var g;g=d.shift();)f.push(g.hide().unbind())}var e=this;e.renderOverlay=a;e.clearOverlays=b;var d=[],f=[]}function Nb(a){var b=this,e,d;b.build=function(){e=[];d=[];a(e,d)};b.cell=function(f,g){var l=e.length,j=d.length,
+t,y=-1,S=-1;for(t=0;t<l;t++)if(g>=e[t][0]&&g<e[t][1]){y=t;break}for(t=0;t<j;t++)if(f>=d[t][0]&&f<d[t][1]){S=t;break}return y>=0&&S>=0?{row:y,col:S}:null};b.rect=function(f,g,l,j,t){t=t.offset();return{top:e[f][0]-t.top,left:d[g][0]-t.left,width:d[j][1]-d[g][0],height:e[l][1]-e[f][0]}}}function Ob(a){function b(j){xc(j);j=a.cell(j.pageX,j.pageY);if(!j!=!l||j&&(j.row!=l.row||j.col!=l.col)){if(j){g||(g=j);f(j,g,j.row-g.row,j.col-g.col)}else f(j,g);l=j}}var e=this,d,f,g,l;e.start=function(j,t,y){f=j;
+g=l=null;a.build();b(t);d=y||"mousemove";m(document).bind(d,b)};e.stop=function(){m(document).unbind(d,b);return l}}function xc(a){if(a.pageX===ma){a.pageX=a.originalEvent.pageX;a.pageY=a.originalEvent.pageY}}function Pb(a){function b(l){return d[l]=d[l]||a(l)}var e=this,d={},f={},g={};e.left=function(l){return f[l]=f[l]===ma?b(l).position().left:f[l]};e.right=function(l){return g[l]=g[l]===ma?e.left(l)+b(l).width():g[l]};e.clear=function(){d={};f={};g={}}}var Ya={defaultView:"month",aspectRatio:1.35,
+header:{left:"title",center:"",right:"today prev,next"},weekends:true,allDayDefault:true,ignoreTimezone:true,lazyFetching:true,startParam:"start",endParam:"end",titleFormat:{month:"MMMM yyyy",week:"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",day:"dddd, MMM d, yyyy"},columnFormat:{month:"ddd",week:"ddd M/d",day:"dddd M/d"},timeFormat:{"":"h(:mm)t"},isRTL:false,firstDay:0,monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan",
+"Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],buttonText:{prev:"&nbsp;&#9668;&nbsp;",next:"&nbsp;&#9658;&nbsp;",prevYear:"&nbsp;&lt;&lt;&nbsp;",nextYear:"&nbsp;&gt;&gt;&nbsp;",today:"today",month:"month",week:"week",day:"day"},theme:false,buttonIcons:{prev:"circle-triangle-w",next:"circle-triangle-e"},unselectAuto:true,dropAccept:"*"},yc=
+{header:{left:"next,prev today",center:"",right:"title"},buttonText:{prev:"&nbsp;&#9658;&nbsp;",next:"&nbsp;&#9668;&nbsp;",prevYear:"&nbsp;&gt;&gt;&nbsp;",nextYear:"&nbsp;&lt;&lt;&nbsp;"},buttonIcons:{prev:"circle-triangle-e",next:"circle-triangle-w"}},Aa=m.fullCalendar={version:"1.5.3"},Ja=Aa.views={};m.fn.fullCalendar=function(a){if(typeof a=="string"){var b=Array.prototype.slice.call(arguments,1),e;this.each(function(){var f=m.data(this,"fullCalendar");if(f&&m.isFunction(f[a])){f=f[a].apply(f,
+b);if(e===ma)e=f;a=="destroy"&&m.removeData(this,"fullCalendar")}});if(e!==ma)return e;return this}var d=a.eventSources||[];delete a.eventSources;if(a.events){d.push(a.events);delete a.events}a=m.extend(true,{},Ya,a.isRTL||a.isRTL===ma&&Ya.isRTL?yc:{},a);this.each(function(f,g){f=m(g);g=new Yb(f,a,d);f.data("fullCalendar",g);g.render()});return this};Aa.sourceNormalizers=[];Aa.sourceFetchers=[];var ac={dataType:"json",cache:false},bc=1;Aa.addDays=ba;Aa.cloneDate=N;Aa.parseDate=kb;Aa.parseISO8601=
+Bb;Aa.parseTime=mb;Aa.formatDate=Oa;Aa.formatDates=ib;var lc=["sun","mon","tue","wed","thu","fri","sat"],Ab=864E5,cc=36E5,wc=6E4,dc={s:function(a){return a.getSeconds()},ss:function(a){return Pa(a.getSeconds())},m:function(a){return a.getMinutes()},mm:function(a){return Pa(a.getMinutes())},h:function(a){return a.getHours()%12||12},hh:function(a){return Pa(a.getHours()%12||12)},H:function(a){return a.getHours()},HH:function(a){return Pa(a.getHours())},d:function(a){return a.getDate()},dd:function(a){return Pa(a.getDate())},
+ddd:function(a,b){return b.dayNamesShort[a.getDay()]},dddd:function(a,b){return b.dayNames[a.getDay()]},M:function(a){return a.getMonth()+1},MM:function(a){return Pa(a.getMonth()+1)},MMM:function(a,b){return b.monthNamesShort[a.getMonth()]},MMMM:function(a,b){return b.monthNames[a.getMonth()]},yy:function(a){return(a.getFullYear()+"").substring(2)},yyyy:function(a){return a.getFullYear()},t:function(a){return a.getHours()<12?"a":"p"},tt:function(a){return a.getHours()<12?"am":"pm"},T:function(a){return a.getHours()<
+12?"A":"P"},TT:function(a){return a.getHours()<12?"AM":"PM"},u:function(a){return Oa(a,"yyyy-MM-dd'T'HH:mm:ss'Z'")},S:function(a){a=a.getDate();if(a>10&&a<20)return"th";return["st","nd","rd"][a%10-1]||"th"}};Aa.applyAll=$a;Ja.month=mc;Ja.basicWeek=nc;Ja.basicDay=oc;wb({weekMode:"fixed"});Ja.agendaWeek=qc;Ja.agendaDay=rc;wb({allDaySlot:true,allDayText:"all-day",firstHour:6,slotMinutes:30,defaultEventMinutes:120,axisFormat:"h(:mm)tt",timeFormat:{agenda:"h:mm{ - h:mm}"},dragOpacity:{agenda:0.5},minTime:0,
+maxTime:24})})(jQuery);

library/fullcalendar/fullcalendar.print.css

@@ -0,0 +1,61 @@
+/*
+ * FullCalendar v1.5.3 Print Stylesheet
+ *
+ * Include this stylesheet on your page to get a more printer-friendly calendar.
+ * When including this stylesheet, use the media='print' attribute of the <link> tag.
+ * Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Mon Feb 6 22:40:40 2012 -0800
+ *
+ */
+ 
+ 
+ /* Events
+-----------------------------------------------------*/
+ 
+.fc-event-skin {
+	background: none !important;
+	color: #000 !important;
+	}
+	
+/* horizontal events */
+	
+.fc-event-hori {
+	border-width: 0 0 1px 0 !important;
+	border-bottom-style: dotted !important;
+	border-bottom-color: #000 !important;
+	padding: 1px 0 0 0 !important;
+	}
+	
+.fc-event-hori .fc-event-inner {
+	border-width: 0 !important;
+	padding: 0 1px !important;
+	}
+	
+/* vertical events */
+	
+.fc-event-vert {
+	border-width: 0 0 0 1px !important;
+	border-left-style: dotted !important;
+	border-left-color: #000 !important;
+	padding: 0 1px 0 0 !important;
+	}
+	
+.fc-event-vert .fc-event-inner {
+	border-width: 0 !important;
+	padding: 1px 0 !important;
+	}
+	
+.fc-event-bg {
+	display: none !important;
+	}
+	
+.fc-event .ui-resizable-handle {
+	display: none !important;
+	}
+	
+	

library/fullcalendar/gcal.js

@@ -0,0 +1,112 @@
+/*
+ * FullCalendar v1.5.3 Google Calendar Plugin
+ *
+ * Copyright (c) 2011 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Mon Feb 6 22:40:40 2012 -0800
+ *
+ */
+ 
+(function($) {
+
+
+var fc = $.fullCalendar;
+var formatDate = fc.formatDate;
+var parseISO8601 = fc.parseISO8601;
+var addDays = fc.addDays;
+var applyAll = fc.applyAll;
+
+
+fc.sourceNormalizers.push(function(sourceOptions) {
+	if (sourceOptions.dataType == 'gcal' ||
+		sourceOptions.dataType === undefined &&
+		(sourceOptions.url || '').match(/^(http|https):\/\/www.google.com\/calendar\/feeds\//)) {
+			sourceOptions.dataType = 'gcal';
+			if (sourceOptions.editable === undefined) {
+				sourceOptions.editable = false;
+			}
+		}
+});
+
+
+fc.sourceFetchers.push(function(sourceOptions, start, end) {
+	if (sourceOptions.dataType == 'gcal') {
+		return transformOptions(sourceOptions, start, end);
+	}
+});
+
+
+function transformOptions(sourceOptions, start, end) {
+
+	var success = sourceOptions.success;
+	var data = $.extend({}, sourceOptions.data || {}, {
+		'start-min': formatDate(start, 'u'),
+		'start-max': formatDate(end, 'u'),
+		'singleevents': true,
+		'max-results': 9999
+	});
+	
+	var ctz = sourceOptions.currentTimezone;
+	if (ctz) {
+		data.ctz = ctz = ctz.replace(' ', '_');
+	}
+
+	return $.extend({}, sourceOptions, {
+		url: sourceOptions.url.replace(/\/basic$/, '/full') + '?alt=json-in-script&callback=?',
+		dataType: 'jsonp',
+		data: data,
+		startParam: false,
+		endParam: false,
+		success: function(data) {
+			var events = [];
+			if (data.feed.entry) {
+				$.each(data.feed.entry, function(i, entry) {
+					var startStr = entry['gd$when'][0]['startTime'];
+					var start = parseISO8601(startStr, true);
+					var end = parseISO8601(entry['gd$when'][0]['endTime'], true);
+					var allDay = startStr.indexOf('T') == -1;
+					var url;
+					$.each(entry.link, function(i, link) {
+						if (link.type == 'text/html') {
+							url = link.href;
+							if (ctz) {
+								url += (url.indexOf('?') == -1 ? '?' : '&') + 'ctz=' + ctz;
+							}
+						}
+					});
+					if (allDay) {
+						addDays(end, -1); // make inclusive
+					}
+					events.push({
+						id: entry['gCal$uid']['value'],
+						title: entry['title']['$t'],
+						url: url,
+						start: start,
+						end: end,
+						allDay: allDay,
+						location: entry['gd$where'][0]['valueString'],
+						description: entry['content']['$t']
+					});
+				});
+			}
+			var args = [events].concat(Array.prototype.slice.call(arguments, 1));
+			var res = applyAll(success, this, args);
+			if ($.isArray(res)) {
+				return res;
+			}
+			return events;
+		}
+	});
+	
+}
+
+
+// legacy
+fc.gcalFeed = function(url, sourceOptions) {
+	return $.extend({}, sourceOptions, { url: url, dataType: 'gcal' });
+};
+
+
+})(jQuery);

library/slinky.php

@@ -181,6 +181,11 @@ class Slinky {
 					$this->service = new Slinky_Fongs();
 					break;
 				}
+			case $this->get( 'yourls-url' ):
+				if ( class_exists( 'Slinky_YourLS' ) ) {
+					$this->service = new Slinky_YourLS();
+					break;
+				}
 			case 'micurl.com':
 				if ( class_exists( 'Slinky_Micurl' ) ) {
 					$this->service = new Slinky_Micurl();
@@ -574,6 +579,31 @@ class Slinky_Fongs extends Slinky_Service {
 	}
 }
 
+// yourls
+class Slinky_YourLS extends Slinky_Service {
+	function url_is_short( $url ) {
+	return stristr( $url, 'shit.li/' );
+    }
+    
+	function url_is_long( $url ) {
+	return !stristr( $url, 'shit.li/' );
+    }
+    
+	function make_short( $url ) {
+		echo $this->get( 'username' );
+		$use_ssl = $this->get( 'ssl' );
+		if ( $use_ssl )
+			$use_ssl  = 's';
+		else
+			$use_ssl = '';
+		$result = $this->url_get( 'http'. $use_ssl . '://' . $this->get( 'yourls-url' ) . '/yourls-api.php?username=' . $this->get( 'username' )  . '&password=' . $this->get( 'password' ) . '&action=shorturl&format=simple&url=' . urlencode( $url ) );
+		if ( 1 != $result && 2 != $result )
+			return $result;
+		else
+			return $url;
+	}
+}
+
 // Micu.rl
 class Slinky_Micurl extends Slinky_Service {
 	function url_is_short( $url ) {

library/spam/README

@@ -0,0 +1,12 @@
+B8 for Friendica
+
+B8 is an excellent bayesian spam implementation for PHP. However when evaluating it for use in Friendica there were a few shortcomings. B8's primary audience is guestbooks and blogs - single user situations. 
+
+Friendica is a multi-user distributed social environment. So the first thing we need to add to b8 is a concept of user ID. 
+
+Second we don't want to use a second stored set of DB login credentials so we're going to implemetn Friendica's MySQL driver and use our existing connection and credentials.
+
+The third requirement is that the B8 processing model is to load a set of word/data sets from the DB, perform processing (which may change the value of the data) and then store the results back to the DB. We're in a highly dynamic environment with lots of sometimes concurrent message processing. So the plan is to alter the storage architecture to read data in, do processing, and then apply a somewhat atomic change operation where the changes are performed in a single query using the current data in storage rather than something passed through outside processing and where the data may be outdated come time to store it.
+
+In accordance with the LGPL of the B8 package these changes are available in source form at http://github.com/friendica/friendica in the directory library/spam
+  

library/spam/b8/b8.php

@@ -0,0 +1,503 @@
+<?php
+
+#   Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   b8 - A Bayesian spam filter written in PHP 5
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Tobias Leupold
+ * @author Oliver Lillie (aka buggedcom) (original PHP 5 port)
+ */
+
+class b8
+{
+
+	public $config = array(
+		'min_size'      => 3,
+		'max_size'      => 30,
+		'allow_numbers' => FALSE,
+		'lexer'         => 'default',
+		'degenerator'   => 'default',
+		'storage'       => 'dba',
+		'use_relevant'  => 15,
+		'min_dev'       => 0.2,
+		'rob_s'         => 0.3,
+		'rob_x'         => 0.5
+	);
+
+	private $_lexer      = NULL;
+	private $_database   = NULL;
+	private $_token_data = NULL;
+
+	const SPAM    = 'spam';
+	const HAM     = 'ham';
+	const LEARN   = 'learn';
+	const UNLEARN = 'unlearn';
+
+	const STARTUP_FAIL_DATABASE = 'STARTUP_FAIL_DATABASE';
+	const STARTUP_FAIL_LEXER    = 'STARTUP_FAIL_LEXER';
+	const TRAINER_CATEGORY_FAIL = 'TRAINER_CATEGORY_FAIL';
+
+	/**
+	 * Constructs b8
+	 *
+	 * @access public
+	 * @return void
+	 */
+
+	function __construct($config = array(), $database_config)
+	{
+
+		# Validate config data
+
+		if(count($config) > 0) {
+
+			foreach ($config as $name=>$value) {
+
+				switch($name) {
+
+					case 'min_dev':
+					case 'rob_s':
+					case 'rob_x':
+						$this->config[$name] = (float) $value;
+						break;
+
+					case 'min_size':
+					case 'max_size':
+					case 'use_relevant':
+						$this->config[$name] = (int) $value;
+						break;
+
+					case 'allow_numbers':
+						$this->config[$name] = (bool) $value;
+						break;
+
+					case 'lexer':
+						$value = (string) strtolower($value);
+						$this->config[$name] = is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . "lexer_" . $value . '.php') === TRUE ? $value : 'default';
+						break;
+
+					case 'storage':
+						$this->config[$name] = (string) $value;
+						break;
+
+				}
+
+			}
+
+		}
+
+		# Setup the database backend
+
+		# Get the basic storage class used by all backends
+		if($this->load_class('b8_storage_base', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_base.php') === FALSE)
+			return;
+
+		# Get the degenerator we need
+		if($this->load_class('b8_degenerator_' . $this->config['degenerator'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'degenerator' . DIRECTORY_SEPARATOR . 'degenerator_' . $this->config['degenerator'] . '.php') === FALSE)
+			return;
+
+		# Get the actual storage backend we need
+		if($this->load_class('b8_storage_' . $this->config['storage'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_' . $this->config['storage'] . '.php') === FALSE)
+			return;
+
+		# Setup the backend
+		$class = 'b8_storage_' . $this->config['storage'];
+		$this->_database = new $class(
+			$database_config,
+			$this->config['degenerator'], date('ymd')
+		);
+
+		# Setup the lexer class
+
+		if($this->load_class('b8_lexer_' . $this->config['lexer'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . 'lexer_' . $this->config['lexer'] . '.php') === FALSE)
+			return;
+
+		$class = 'b8_lexer_' . $this->config['lexer'];
+		$this->_lexer = new $class(
+			array(
+				'min_size' => $this->config['min_size'],
+				'max_size' => $this->config['max_size'],
+				'allow_numbers' => $this->config['allow_numbers']
+			)
+		);
+
+	}
+
+	/**
+	 * Load a class file if a class has not been defined yet.
+	 *
+	 * @access public
+	 * @return boolean Returns TRUE if everything is okay, otherwise FALSE.
+	 */
+
+	public function load_class($class_name, $class_file)
+	{
+
+		if(class_exists($class_name, FALSE) === FALSE) {
+
+			$included = require_once $class_file;
+
+			if($included === FALSE or class_exists($class_name, FALSE) === FALSE)
+				return FALSE;
+
+		}
+
+		return TRUE;
+
+	}
+
+	/**
+	 * Validates the class has all it needs to work.
+	 *
+	 * @access public
+	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
+	 */
+
+	public function validate()
+	{
+
+		if($this->_database === NULL)
+			return self::STARTUP_FAIL_DATABASE;
+
+		# Connect the database backend if we aren't connected yet
+
+		elseif($this->_database->connected === FALSE) {
+
+			$connection = $this->_database->connect();
+
+			if($connection !== TRUE)
+				return $connection;
+
+		}
+
+		if($this->_lexer === NULL)
+			return self::STARTUP_FAIL_LEXER;
+
+		return TRUE;
+
+	}
+
+	/**
+	 * Classifies a text
+	 *
+	 * @access public
+	 * @package default
+	 * @param string $text
+	 * @return float The rating between 0 (ham) and 1 (spam)
+	 */
+
+	public function classify($uid,$text)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# Get the internal database variables, containing the number of ham and
+		# spam texts so the spam probability can be calculated in relation to them
+		$internals = $this->_database->get_internals($uid);
+
+		# Calculate the spamminess of all tokens
+
+		# Get all tokens we want to rate
+
+		$tokens = $this->_lexer->get_tokens($text);
+
+		# Check if the lexer failed
+		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
+		if(!is_array($tokens))
+			return $tokens;
+
+		# Fetch all availible data for the token set from the database
+		$this->_token_data = $this->_database->get(array_keys($tokens),$uid);
+
+		# Calculate the spamminess and importance for each token (or a degenerated form of it)
+
+		$word_count = array();
+		$rating     = array();
+		$importance = array();
+
+		foreach($tokens as $word => $count) {
+
+			$word_count[$word] = $count;
+
+			# Although we only call this function only here ... let's do the
+			# calculation stuff in a function to make this a bit less confusing ;-)
+			$rating[$word] = $this->_get_probability($word, $internals['texts_ham'], $internals['texts_spam']);
+
+			$importance[$word] = abs(0.5 - $rating[$word]);
+
+		}
+
+		# Order by importance
+		arsort($importance);
+		reset($importance);
+
+		# Get the most interesting tokens (use all if we have less than the given number)
+
+		$relevant = array();
+
+		for($i = 0; $i < $this->config['use_relevant']; $i++) {
+
+			if($tmp = each($importance)) {
+
+				# Important tokens remain
+
+				# If the token's rating is relevant enough, use it
+
+				if(abs(0.5 - $rating[$tmp['key']]) > $this->config['min_dev']) {
+
+					# Tokens that appear more than once also count more than once
+
+					for($x = 0, $l = $word_count[$tmp['key']]; $x < $l; $x++)
+						array_push($relevant, $rating[$tmp['key']]);
+
+				}
+
+			}
+
+			else {
+				# We have less than words to use, so we already
+				# use what we have and can break here
+				break;
+			}
+
+		}
+
+		# Calculate the spamminess of the text (thanks to Mr. Robinson ;-)
+		# We set both hamminess and Spamminess to 1 for the first multiplying
+		$hamminess  = 1;
+		$spamminess = 1;
+
+		# Consider all relevant ratings
+		foreach($relevant as $value) {
+			$hamminess  *= (1.0 - $value);
+			$spamminess *= $value;
+		}
+
+		# If no token was good for calculation, we really don't know how
+		# to rate this text; so we assume a spam and ham probability of 0.5
+
+		if($hamminess === 1 and $spamminess === 1) {
+			$hamminess = 0.5;
+			$spamminess = 0.5;
+			$n = 1;
+		}
+		else {
+			# Get the number of relevant ratings
+			$n = count($relevant);
+		}
+
+		# Calculate the combined rating
+
+		# The actual hamminess and spamminess
+		$hamminess  = 1 - pow($hamminess,  (1 / $n));
+		$spamminess = 1 - pow($spamminess, (1 / $n));
+
+		# Calculate the combined indicator
+		$probability = ($hamminess - $spamminess) / ($hamminess + $spamminess);
+
+		# We want a value between 0 and 1, not between -1 and +1, so ...
+		$probability = (1 + $probability) / 2;
+
+		# Alea iacta est
+		return $probability;
+
+	}
+
+	/**
+	 * Calculate the spamminess of a single token also considering "degenerated" versions
+	 *
+	 * @access private
+	 * @param string $word
+	 * @param string $texts_ham
+	 * @param string $texts_spam
+	 * @return void
+	 */
+
+	private function _get_probability($word, $texts_ham, $texts_spam)
+	{
+
+		# Let's see what we have!
+
+		if(isset($this->_token_data['tokens'][$word]) === TRUE) {
+			# The token was in the database, so we can use it's data as-is
+			# and calculate the spamminess of this token directly
+			return $this->_calc_probability($this->_token_data['tokens'][$word], $texts_ham, $texts_spam);
+		}
+
+		# Damn. The token was not found, so do we have at least similar words?
+
+		if(isset($this->_token_data['degenerates'][$word]) === TRUE) {
+
+			# We found similar words, so calculate the spamminess for each one
+			# and choose the most important one for the further calculation
+
+			# The default rating is 0.5 simply saying nothing
+			$rating = 0.5;
+
+			foreach($this->_token_data['degenerates'][$word] as $degenerate => $count) {
+
+				# Calculate the rating of the current degenerated token
+				$rating_tmp = $this->_calc_probability($count, $texts_ham, $texts_spam);
+
+				# Is it more important than the rating of another degenerated version?
+				if(abs(0.5 - $rating_tmp) > abs(0.5 - $rating))
+					$rating = $rating_tmp;
+
+			}
+
+			return $rating;
+
+		}
+
+		else {
+			# The token is really unknown, so choose the default rating
+			# for completely unknown tokens. This strips down to the
+			# robX parameter so we can cheap out the freaky math ;-)
+			return $this->config['rob_x'];
+		}
+
+	}
+
+	/**
+	 * Do the actual spamminess calculation of a single token
+	 *
+	 * @access private
+	 * @param array $data
+	 * @param string $texts_ham
+	 * @param string $texts_spam
+	 * @return void
+	 */
+
+	private function _calc_probability($data, $texts_ham, $texts_spam)
+	{
+
+		# Calculate the basic probability by Mr. Graham
+
+		# But: consider the number of ham and spam texts saved instead of the
+		# number of entries where the token appeared to calculate a relative
+		# spamminess because we count tokens appearing multiple times not just
+		# once but as often as they appear in the learned texts
+
+		$rel_ham = $data['count_ham'];
+		$rel_spam = $data['count_spam'];
+
+		if($texts_ham > 0)
+			$rel_ham = $data['count_ham'] / $texts_ham;
+
+		if($texts_spam > 0)
+			$rel_spam = $data['count_spam'] / $texts_spam;
+
+		$rating = $rel_spam / ($rel_ham + $rel_spam);
+
+		# Calculate the better probability proposed by Mr. Robinson
+		$all = $data['count_ham'] + $data['count_spam'];
+		return (($this->config['rob_s'] * $this->config['rob_x']) + ($all * $rating)) / ($this->config['rob_s'] + $all);
+
+	}
+
+	/**
+	 * Check the validity of the category of a request
+	 *
+	 * @access private
+	 * @param string $category
+	 * @return void
+	 */
+
+	private function _check_category($category)
+	{
+		return $category === self::HAM or $category === self::SPAM;
+	}
+
+	/**
+	 * Learn a reference text
+	 *
+	 * @access public
+	 * @param string $text
+	 * @param const $category Either b8::SPAM or b8::HAM
+	 * @return void
+	 */
+
+	public function learn($text, $category, $uid)
+	{
+		return $this->_process_text($text, $category, self::LEARN, $uid);
+	}
+
+	/**
+	 * Unlearn a reference text
+	 *
+	 * @access public
+	 * @param string $text
+	 * @param const $category Either b8::SPAM or b8::HAM
+	 * @return void
+	 */
+
+	public function unlearn($text, $category, $uid)
+	{
+		return $this->_process_text($text, $category, self::UNLEARN, $uid);
+	}
+
+	/**
+	 * Does the actual interaction with the storage backend for learning or unlearning texts
+	 *
+	 * @access private
+	 * @param string $text
+	 * @param const $category Either b8::SPAM or b8::HAM
+	 * @param const $action Either b8::LEARN or b8::UNLEARN
+	 * @return void
+	 */
+
+	private function _process_text($text, $category, $action, $uid = 0)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# Look if the request is okay
+		if($this->_check_category($category) === FALSE)
+			return self::TRAINER_CATEGORY_FAIL;
+
+		# Get all tokens from $text
+
+		$tokens = $this->_lexer->get_tokens($text);
+
+		# Check if the lexer failed
+		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
+		if(!is_array($tokens))
+			return $tokens;
+
+		# Pass the tokens and what to do with it to the storage backend
+		return $this->_database->process_text($tokens, $category, $action, $uid);
+
+	}
+
+}
+
+?>

library/spam/b8/b8.php.ORIG

@@ -0,0 +1,503 @@
+<?php
+
+#   Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   b8 - A Bayesian spam filter written in PHP 5
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Tobias Leupold
+ * @author Oliver Lillie (aka buggedcom) (original PHP 5 port)
+ */
+
+class b8
+{
+
+	public $config = array(
+		'min_size'      => 3,
+		'max_size'      => 30,
+		'allow_numbers' => FALSE,
+		'lexer'         => 'default',
+		'degenerator'   => 'default',
+		'storage'       => 'dba',
+		'use_relevant'  => 15,
+		'min_dev'       => 0.2,
+		'rob_s'         => 0.3,
+		'rob_x'         => 0.5
+	);
+
+	private $_lexer      = NULL;
+	private $_database   = NULL;
+	private $_token_data = NULL;
+
+	const SPAM    = 'spam';
+	const HAM     = 'ham';
+	const LEARN   = 'learn';
+	const UNLEARN = 'unlearn';
+
+	const STARTUP_FAIL_DATABASE = 'STARTUP_FAIL_DATABASE';
+	const STARTUP_FAIL_LEXER    = 'STARTUP_FAIL_LEXER';
+	const TRAINER_CATEGORY_FAIL = 'TRAINER_CATEGORY_FAIL';
+
+	/**
+	 * Constructs b8
+	 *
+	 * @access public
+	 * @return void
+	 */
+
+	function __construct($config = array(), $database_config)
+	{
+
+		# Validate config data
+
+		if(count($config) > 0) {
+
+			foreach ($config as $name=>$value) {
+
+				switch($name) {
+
+					case 'min_dev':
+					case 'rob_s':
+					case 'rob_x':
+						$this->config[$name] = (float) $value;
+						break;
+
+					case 'min_size':
+					case 'max_size':
+					case 'use_relevant':
+						$this->config[$name] = (int) $value;
+						break;
+
+					case 'allow_numbers':
+						$this->config[$name] = (bool) $value;
+						break;
+
+					case 'lexer':
+						$value = (string) strtolower($value);
+						$this->config[$name] = is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . "lexer_" . $value . '.php') === TRUE ? $value : 'default';
+						break;
+
+					case 'storage':
+						$this->config[$name] = (string) $value;
+						break;
+
+				}
+
+			}
+
+		}
+
+		# Setup the database backend
+
+		# Get the basic storage class used by all backends
+		if($this->load_class('b8_storage_base', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_base.php') === FALSE)
+			return;
+
+		# Get the degenerator we need
+		if($this->load_class('b8_degenerator_' . $this->config['degenerator'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'degenerator' . DIRECTORY_SEPARATOR . 'degenerator_' . $this->config['degenerator'] . '.php') === FALSE)
+			return;
+
+		# Get the actual storage backend we need
+		if($this->load_class('b8_storage_' . $this->config['storage'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'storage_' . $this->config['storage'] . '.php') === FALSE)
+			return;
+
+		# Setup the backend
+		$class = 'b8_storage_' . $this->config['storage'];
+		$this->_database = new $class(
+			$database_config,
+			$this->config['degenerator'], date('ymd')
+		);
+
+		# Setup the lexer class
+
+		if($this->load_class('b8_lexer_' . $this->config['lexer'], dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lexer' . DIRECTORY_SEPARATOR . 'lexer_' . $this->config['lexer'] . '.php') === FALSE)
+			return;
+
+		$class = 'b8_lexer_' . $this->config['lexer'];
+		$this->_lexer = new $class(
+			array(
+				'min_size' => $this->config['min_size'],
+				'max_size' => $this->config['max_size'],
+				'allow_numbers' => $this->config['allow_numbers']
+			)
+		);
+
+	}
+
+	/**
+	 * Load a class file if a class has not been defined yet.
+	 *
+	 * @access public
+	 * @return boolean Returns TRUE if everything is okay, otherwise FALSE.
+	 */
+
+	public function load_class($class_name, $class_file)
+	{
+
+		if(class_exists($class_name, FALSE) === FALSE) {
+
+			$included = require_once $class_file;
+
+			if($included === FALSE or class_exists($class_name, FALSE) === FALSE)
+				return FALSE;
+
+		}
+
+		return TRUE;
+
+	}
+
+	/**
+	 * Validates the class has all it needs to work.
+	 *
+	 * @access public
+	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
+	 */
+
+	public function validate()
+	{
+
+		if($this->_database === NULL)
+			return self::STARTUP_FAIL_DATABASE;
+
+		# Connect the database backend if we aren't connected yet
+
+		elseif($this->_database->connected === FALSE) {
+
+			$connection = $this->_database->connect();
+
+			if($connection !== TRUE)
+				return $connection;
+
+		}
+
+		if($this->_lexer === NULL)
+			return self::STARTUP_FAIL_LEXER;
+
+		return TRUE;
+
+	}
+
+	/**
+	 * Classifies a text
+	 *
+	 * @access public
+	 * @package default
+	 * @param string $text
+	 * @return float The rating between 0 (ham) and 1 (spam)
+	 */
+
+	public function classify($text)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# Get the internal database variables, containing the number of ham and
+		# spam texts so the spam probability can be calculated in relation to them
+		$internals = $this->_database->get_internals();
+
+		# Calculate the spamminess of all tokens
+
+		# Get all tokens we want to rate
+
+		$tokens = $this->_lexer->get_tokens($text);
+
+		# Check if the lexer failed
+		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
+		if(!is_array($tokens))
+			return $tokens;
+
+		# Fetch all availible data for the token set from the database
+		$this->_token_data = $this->_database->get(array_keys($tokens));
+
+		# Calculate the spamminess and importance for each token (or a degenerated form of it)
+
+		$word_count = array();
+		$rating     = array();
+		$importance = array();
+
+		foreach($tokens as $word => $count) {
+
+			$word_count[$word] = $count;
+
+			# Although we only call this function only here ... let's do the
+			# calculation stuff in a function to make this a bit less confusing ;-)
+			$rating[$word] = $this->_get_probability($word, $internals['texts_ham'], $internals['texts_spam']);
+
+			$importance[$word] = abs(0.5 - $rating[$word]);
+
+		}
+
+		# Order by importance
+		arsort($importance);
+		reset($importance);
+
+		# Get the most interesting tokens (use all if we have less than the given number)
+
+		$relevant = array();
+
+		for($i = 0; $i < $this->config['use_relevant']; $i++) {
+
+			if($tmp = each($importance)) {
+
+				# Important tokens remain
+
+				# If the token's rating is relevant enough, use it
+
+				if(abs(0.5 - $rating[$tmp['key']]) > $this->config['min_dev']) {
+
+					# Tokens that appear more than once also count more than once
+
+					for($x = 0, $l = $word_count[$tmp['key']]; $x < $l; $x++)
+						array_push($relevant, $rating[$tmp['key']]);
+
+				}
+
+			}
+
+			else {
+				# We have less than words to use, so we already
+				# use what we have and can break here
+				break;
+			}
+
+		}
+
+		# Calculate the spamminess of the text (thanks to Mr. Robinson ;-)
+		# We set both hamminess and Spamminess to 1 for the first multiplying
+		$hamminess  = 1;
+		$spamminess = 1;
+
+		# Consider all relevant ratings
+		foreach($relevant as $value) {
+			$hamminess  *= (1.0 - $value);
+			$spamminess *= $value;
+		}
+
+		# If no token was good for calculation, we really don't know how
+		# to rate this text; so we assume a spam and ham probability of 0.5
+
+		if($hamminess === 1 and $spamminess === 1) {
+			$hamminess = 0.5;
+			$spamminess = 0.5;
+			$n = 1;
+		}
+		else {
+			# Get the number of relevant ratings
+			$n = count($relevant);
+		}
+
+		# Calculate the combined rating
+
+		# The actual hamminess and spamminess
+		$hamminess  = 1 - pow($hamminess,  (1 / $n));
+		$spamminess = 1 - pow($spamminess, (1 / $n));
+
+		# Calculate the combined indicator
+		$probability = ($hamminess - $spamminess) / ($hamminess + $spamminess);
+
+		# We want a value between 0 and 1, not between -1 and +1, so ...
+		$probability = (1 + $probability) / 2;
+
+		# Alea iacta est
+		return $probability;
+
+	}
+
+	/**
+	 * Calculate the spamminess of a single token also considering "degenerated" versions
+	 *
+	 * @access private
+	 * @param string $word
+	 * @param string $texts_ham
+	 * @param string $texts_spam
+	 * @return void
+	 */
+
+	private function _get_probability($word, $texts_ham, $texts_spam)
+	{
+
+		# Let's see what we have!
+
+		if(isset($this->_token_data['tokens'][$word]) === TRUE) {
+			# The token was in the database, so we can use it's data as-is
+			# and calculate the spamminess of this token directly
+			return $this->_calc_probability($this->_token_data['tokens'][$word], $texts_ham, $texts_spam);
+		}
+
+		# Damn. The token was not found, so do we have at least similar words?
+
+		if(isset($this->_token_data['degenerates'][$word]) === TRUE) {
+
+			# We found similar words, so calculate the spamminess for each one
+			# and choose the most important one for the further calculation
+
+			# The default rating is 0.5 simply saying nothing
+			$rating = 0.5;
+
+			foreach($this->_token_data['degenerates'][$word] as $degenerate => $count) {
+
+				# Calculate the rating of the current degenerated token
+				$rating_tmp = $this->_calc_probability($count, $texts_ham, $texts_spam);
+
+				# Is it more important than the rating of another degenerated version?
+				if(abs(0.5 - $rating_tmp) > abs(0.5 - $rating))
+					$rating = $rating_tmp;
+
+			}
+
+			return $rating;
+
+		}
+
+		else {
+			# The token is really unknown, so choose the default rating
+			# for completely unknown tokens. This strips down to the
+			# robX parameter so we can cheap out the freaky math ;-)
+			return $this->config['rob_x'];
+		}
+
+	}
+
+	/**
+	 * Do the actual spamminess calculation of a single token
+	 *
+	 * @access private
+	 * @param array $data
+	 * @param string $texts_ham
+	 * @param string $texts_spam
+	 * @return void
+	 */
+
+	private function _calc_probability($data, $texts_ham, $texts_spam)
+	{
+
+		# Calculate the basic probability by Mr. Graham
+
+		# But: consider the number of ham and spam texts saved instead of the
+		# number of entries where the token appeared to calculate a relative
+		# spamminess because we count tokens appearing multiple times not just
+		# once but as often as they appear in the learned texts
+
+		$rel_ham = $data['count_ham'];
+		$rel_spam = $data['count_spam'];
+
+		if($texts_ham > 0)
+			$rel_ham = $data['count_ham'] / $texts_ham;
+
+		if($texts_spam > 0)
+			$rel_spam = $data['count_spam'] / $texts_spam;
+
+		$rating = $rel_spam / ($rel_ham + $rel_spam);
+
+		# Calculate the better probability proposed by Mr. Robinson
+		$all = $data['count_ham'] + $data['count_spam'];
+		return (($this->config['rob_s'] * $this->config['rob_x']) + ($all * $rating)) / ($this->config['rob_s'] + $all);
+
+	}
+
+	/**
+	 * Check the validity of the category of a request
+	 *
+	 * @access private
+	 * @param string $category
+	 * @return void
+	 */
+
+	private function _check_category($category)
+	{
+		return $category === self::HAM or $category === self::SPAM;
+	}
+
+	/**
+	 * Learn a reference text
+	 *
+	 * @access public
+	 * @param string $text
+	 * @param const $category Either b8::SPAM or b8::HAM
+	 * @return void
+	 */
+
+	public function learn($text, $category)
+	{
+		return $this->_process_text($text, $category, self::LEARN);
+	}
+
+	/**
+	 * Unlearn a reference text
+	 *
+	 * @access public
+	 * @param string $text
+	 * @param const $category Either b8::SPAM or b8::HAM
+	 * @return void
+	 */
+
+	public function unlearn($text, $category)
+	{
+		return $this->_process_text($text, $category, self::UNLEARN);
+	}
+
+	/**
+	 * Does the actual interaction with the storage backend for learning or unlearning texts
+	 *
+	 * @access private
+	 * @param string $text
+	 * @param const $category Either b8::SPAM or b8::HAM
+	 * @param const $action Either b8::LEARN or b8::UNLEARN
+	 * @return void
+	 */
+
+	private function _process_text($text, $category, $action)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# Look if the request is okay
+		if($this->_check_category($category) === FALSE)
+			return self::TRAINER_CATEGORY_FAIL;
+
+		# Get all tokens from $text
+
+		$tokens = $this->_lexer->get_tokens($text);
+
+		# Check if the lexer failed
+		# (if so, $tokens will be a lexer error code, if not, $tokens will be an array)
+		if(!is_array($tokens))
+			return $tokens;
+
+		# Pass the tokens and what to do with it to the storage backend
+		return $this->_database->process_text($tokens, $category, $action);
+
+	}
+
+}
+
+?>

library/spam/b8/degenerator/degenerator_default.php

@@ -0,0 +1,127 @@
+<?php
+
+#   Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Tobias Leupold
+ */
+
+class b8_degenerator_default
+{
+
+	public $degenerates = array();
+
+	/**
+	 * Generates a list of "degenerated" words for a list of words.
+	 *
+	 * @access public
+	 * @param array $tokens
+	 * @return array An array containing an array of degenerated tokens for each token
+	 */
+
+	public function degenerate(array $words)
+	{
+
+		$degenerates = array();
+
+		foreach($words as $word)
+			$degenerates[$word] = $this->_degenerate_word($word);
+
+		return $degenerates;
+
+	}
+
+	/**
+	 * If the original word is not found in the database then
+	 * we build "degenerated" versions of the word to lookup.
+	 *
+	 * @access private
+	 * @param string $word
+	 * @return array An array of degenerated words
+	 */
+
+	protected function _degenerate_word($word)
+	{
+
+		# Check for any stored words so the process doesn't have to repeat
+		if(isset($this->degenerates[$word]) === TRUE)
+			return $this->degenerates[$word];
+
+		$degenerate = array();
+
+		# Add different version of upper and lower case and ucfirst
+		array_push($degenerate, strtolower($word));
+		array_push($degenerate, strtoupper($word));
+		array_push($degenerate, ucfirst($word));
+
+		# Degenerate all versions
+
+		foreach($degenerate as $alt_word) {
+
+			# Look for stuff like !!! and ???
+
+			if(preg_match('/[!?]$/', $alt_word) > 0) {
+
+				# Add versions with different !s and ?s
+
+				if(preg_match('/[!?]{2,}$/', $alt_word) > 0) {
+					$tmp = preg_replace('/([!?])+$/', '$1', $alt_word);
+					array_push($degenerate, $tmp);
+				}
+
+				$tmp = preg_replace('/([!?])+$/', '', $alt_word);
+				array_push($degenerate, $tmp);
+
+			}
+
+			# Look for ... at the end of the word
+
+			$alt_word_int = $alt_word;
+
+			while(preg_match('/[\.]$/', $alt_word_int) > 0) {
+				$alt_word_int = substr($alt_word_int, 0, strlen($alt_word_int) - 1);
+				array_push($degenerate, $alt_word_int);
+			}
+
+		}
+
+		# Some degenerates are the same as the original word. These don't have
+		# to be fetched, so we create a new array with only new tokens
+
+		$real_degenerate = array();
+
+		foreach($degenerate as $deg_word) {
+			if($word != $deg_word)
+				array_push($real_degenerate, $deg_word);
+		}
+
+		# Store the list of degenerates for the token
+		$this->degenerates[$word] = $real_degenerate;
+
+		return $real_degenerate;
+
+	}
+
+}
+
+?>

library/spam/b8/lexer/lexer_default.php

@@ -0,0 +1,205 @@
+<?php
+
+#   Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Tobias Leupold
+ * @author Oliver Lillie (aka buggedcom) (original PHP 5 port)
+ */
+
+class b8_lexer_default
+{
+
+	const LEXER_TEXT_NOT_STRING = 'LEXER_TEXT_NOT_STRING';
+	const LEXER_TEXT_EMPTY      = 'LEXER_TEXT_EMPTY';
+
+	public $config = NULL;
+
+	# The regular expressions we use to split the text to tokens
+
+	public $regexp = array(
+		'ip'        => '/([A-Za-z0-9\_\-\.]+)/',
+		'raw_split' => '/[\s,\.\/"\:;\|<>\-_\[\]{}\+=\)\(\*\&\^%]+/',
+		'html'      => '/(<.+?>)/',
+		'tagname'   => '/(.+?)\s/',
+		'numbers'   => '/^[0-9]+$/'
+	);
+
+	/**
+	 * Constructs the lexer.
+	 *
+	 * @access public
+	 * @return void
+	 */
+
+	function __construct($config)
+	{
+		$this->config = $config;
+	}
+
+	/**
+	 * Generates the tokens required for the bayesian filter.
+	 *
+	 * @access public
+	 * @param string $text
+	 * @return array Returns the list of tokens
+	 */
+
+	public function get_tokens($text)
+	{
+
+		# Check that we actually have a string ...
+		if(is_string($text) === FALSE)
+			return self::LEXER_TEXT_NOT_STRING;
+
+		# ... and that it's not empty
+		if(empty($text) === TRUE)
+			return self::LEXER_TEXT_EMPTY;
+
+		# Re-convert the text to the original characters coded in UTF-8, as
+		# they have been coded in html entities during the post process
+		$text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
+
+		$tokens = array();
+
+		# Find URLs and IP addresses
+
+		preg_match_all($this->regexp['ip'], $text, $raw_tokens);
+
+		foreach($raw_tokens[1] as $word) {
+
+			# Check for a dot
+			if(strpos($word, '.') === FALSE)
+				continue;
+
+			# Check that the word is valid, min and max sizes, etc.
+			if($this->_is_valid($word) === FALSE)
+				continue;
+
+			if(isset($tokens[$word]) === FALSE)
+				$tokens[$word] = 1;
+			else
+				$tokens[$word] += 1;
+
+			# Delete the word from the text so it doesn't get re-added.
+			$text = str_replace($word, '', $text);
+
+			# Also process the parts of the URLs
+			$url_parts = preg_split($this->regexp['raw_split'], $word);
+
+			foreach($url_parts as $word) {
+
+				# Again validate the part
+
+				if($this->_is_valid($word) === FALSE)
+					continue;
+
+				if(isset($tokens[$word]) === FALSE)
+					$tokens[$word] = 1;
+				else
+					$tokens[$word] += 1;
+
+			}
+
+		}
+
+		# Split the remaining text
+
+		$raw_tokens = preg_split($this->regexp['raw_split'], $text);
+
+		foreach($raw_tokens as $word) {
+
+			# Again validate the part
+
+			if($this->_is_valid($word) === FALSE)
+				continue;
+
+			if(isset($tokens[$word]) === FALSE)
+				$tokens[$word] = 1;
+			else
+				$tokens[$word] += 1;
+
+		}
+
+		# Process the HTML
+
+		preg_match_all($this->regexp['html'], $text, $raw_tokens);
+
+		foreach($raw_tokens[1] as $word) {
+
+			# Again validate the part
+
+			if($this->_is_valid($word) === FALSE)
+				continue;
+
+			# If the tag has parameters, just use the tag itself
+
+			if(strpos($word, ' ') !== FALSE) {
+				preg_match($this->regexp['tagname'], $word, $tmp);
+				$word = "{$tmp[1]}...>";
+			}
+
+			if(isset($tokens[$word]) === FALSE)
+				$tokens[$word] = 1;
+			else
+				$tokens[$word] += 1;
+
+		}
+
+		# Return a list of all found tokens
+		return $tokens;
+
+	}
+
+	/**
+	 * Validates a token.
+	 *
+	 * @access private
+	 * @param string $token The token string.
+	 * @return boolean Returns TRUE if the token is valid, otherwise returns FALSE
+	 */
+
+	private function _is_valid($token)
+	{
+
+		# Validate the size of the token
+
+		$len = strlen($token);
+
+		if($len < $this->config['min_size'] or $len > $this->config['max_size'])
+			return FALSE;
+
+		# We may want to exclude pure numbers
+		if($this->config['allow_numbers'] === FALSE) {
+			if(preg_match($this->regexp['numbers'], $token) > 0)
+				return FALSE;
+		}
+
+		# Token is okay
+		return TRUE;
+
+	}
+
+}
+
+?>

library/spam/b8/storage/storage_base.php

@@ -0,0 +1,396 @@
+<?php
+
+#   Copyright (C) 2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * Functions used by all storage backends
+ * Copyright (C) 2010 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Tobias Leupold
+ */
+
+abstract class b8_storage_base
+{
+
+	public $connected            = FALSE;
+
+	protected $_degenerator      = NULL;
+
+	const INTERNALS_TEXTS_HAM    = 'bayes*texts.ham';
+	const INTERNALS_TEXTS_SPAM   = 'bayes*texts.spam';
+	const INTERNALS_DBVERSION    = 'bayes*dbversion';
+
+	const BACKEND_NOT_CONNECTED  = 'BACKEND_NOT_CONNECTED';
+	const DATABASE_WRONG_VERSION = 'DATABASE_WRONG_VERSION';
+	const DATABASE_NOT_B8        = 'DATABASE_NOT_B8';
+
+	/**
+	 * Validates the class has all it needs to work.
+	 *
+	 * @access protected
+	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
+	 */
+
+	protected function validate()
+	{
+
+		# We set up the degenerator here, as we would have to duplicate code if it
+		# was done in the constructor of the respective storage backend.
+		$class = 'b8_degenerator_' . $this->b8_config['degenerator'];
+		$this->_degenerator = new $class();
+
+		if($this->connected !== TRUE)
+			return self::BACKEND_NOT_CONNECTED;
+
+		return TRUE;
+
+	}
+
+	/**
+	 * Checks if a b8 database is used and if it's version is okay
+	 *
+	 * @access protected
+	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
+	 */
+
+	protected function check_database($uid)
+	{
+
+		$internals = $this->get_internals($uid);
+
+		if(isset($internals['dbversion'])) {
+			if($internals['dbversion'] == "2") {
+				return TRUE;
+			}
+			else {
+				$this->connected = FALSE;
+				return self::DATABASE_WRONG_VERSION;
+			}
+		}
+		else {
+			$this->connected = FALSE;
+			return self::DATABASE_NOT_B8;
+		}
+
+	}
+
+	/**
+	 * Parses the "count" data of a token.
+	 *
+	 * @access private
+	 * @param string $data
+	 * @return array Returns an array of the parsed data: array(count_ham, count_spam, lastseen).
+	 */
+
+	private function _parse_count($data)
+	{
+
+		list($count_ham, $count_spam, $lastseen) = explode(' ', $data);
+
+		$count_ham  = (int) $count_ham;
+		$count_spam = (int) $count_spam;
+
+		return array(
+			'count_ham'  => $count_ham,
+			'count_spam' => $count_spam
+		);
+
+	}
+
+	/**
+	 * Get the database's internal variables.
+	 *
+	 * @access public
+	 * @return array Returns an array of all internals.
+	 */
+
+	public function get_internals($uid)
+	{
+
+		$internals = $this->_get_query(
+			array(
+				self::INTERNALS_TEXTS_HAM,
+				self::INTERNALS_TEXTS_SPAM,
+				self::INTERNALS_DBVERSION
+			),
+			$uid
+		);
+
+		return array(
+			'texts_ham'  => (int) $internals[self::INTERNALS_TEXTS_HAM],
+			'texts_spam' => (int) $internals[self::INTERNALS_TEXTS_SPAM],
+			'dbversion'  => (int) $internals[self::INTERNALS_DBVERSION]
+		);
+
+	}
+
+	/**
+	 * Get all data about a list of tags from the database.
+	 *
+	 * @access public
+	 * @param array $tokens
+	 * @return mixed Returns FALSE on failure, otherwise returns array of returned data in the format array('tokens' => array(token => count), 'degenerates' => array(token => array(degenerate => count))).
+	 */
+
+	public function get($tokens, $uid)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# First we see what we have in the database.
+		$token_data = $this->_get_query($tokens, $uid);
+
+		# Check if we have to degenerate some tokens
+
+		$missing_tokens = array();
+
+		foreach($tokens as $token) {
+			if(!isset($token_data[$token]))
+				$missing_tokens[] = $token;
+		}
+
+		if(count($missing_tokens) > 0) {
+
+			# We have to degenerate some tokens
+			$degenerates_list = array();
+
+			# Generate a list of degenerated tokens for the missing tokens ...
+			$degenerates = $this->_degenerator->degenerate($missing_tokens);
+
+			# ... and look them up
+
+			foreach($degenerates as $token => $token_degenerates)
+				$degenerates_list = array_merge($degenerates_list, $token_degenerates);
+
+			$token_data = array_merge($token_data, $this->_get_query($degenerates_list));
+
+		}
+
+		# Here, we have all availible data in $token_data.
+
+		$return_data_tokens = array();
+		$return_data_degenerates = array();
+
+		foreach($tokens as $token) {
+
+			if(isset($token_data[$token]) === TRUE) {
+
+				# The token was found in the database
+
+				# Add the data ...
+				$return_data_tokens[$token] = $this->_parse_count($token_data[$token]);
+
+				# ... and update it's lastseen parameter
+				$this->_update($token, "{$return_data_tokens[$token]['count_ham']} {$return_data_tokens[$token]['count_spam']} " . $this->b8_config['today'], $uid );
+
+			}
+
+			else {
+
+				# The token was not found, so we look if we
+				# can return data for degenerated tokens
+
+				# Check all degenerated forms of the token
+
+				foreach($this->_degenerator->degenerates[$token] as $degenerate) {
+
+					if(isset($token_data[$degenerate]) === TRUE) {
+
+						# A degeneration of the token way found in the database
+
+						# Add the data ...
+						$return_data_degenerates[$token][$degenerate] = $this->_parse_count($token_data[$degenerate]);
+
+						# ... and update it's lastseen parameter
+						$this->_update($degenerate, "{$return_data_degenerates[$token][$degenerate]['count_ham']} {$return_data_degenerates[$token][$degenerate]['count_spam']} " . $this->b8_config['today'], $uid);
+
+					}
+
+				}
+
+			}
+
+		}
+
+		# Now, all token data directly found in the database is in $return_data_tokens
+		# and all data for degenerated versions is in $return_data_degenerates
+
+		# First, we commit the changes to the lastseen parameters
+		$this->_commit();
+
+		# Then, we return what we have
+		return array(
+			'tokens'      => $return_data_tokens,
+			'degenerates' => $return_data_degenerates
+		);
+
+	}
+
+	/**
+	 * Stores or deletes a list of tokens from the given category.
+	 *
+	 * @access public
+	 * @param array $tokens
+	 * @param const $category Either b8::HAM or b8::SPAM
+	 * @param const $action Either b8::LEARN or b8::UNLEARN
+	 * @return void
+	 */
+
+	public function process_text($tokens, $category, $action, $uid)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# No matter what we do, we first have to check what data we have.
+
+		# First get the internals, including the ham texts and spam texts counter
+		$internals = $this->get_internals($uid);
+
+		# Then, fetch all data for all tokens we have (and update their lastseen parameters)
+		$token_data = $this->_get_query(array_keys($tokens), $uid);
+
+		# Process all tokens to learn/unlearn
+
+		foreach($tokens as $token => $count) {
+
+			if(isset($token_data[$token])) {
+
+				# We already have this token, so update it's data
+
+				# Get the existing data
+				list($count_ham, $count_spam, $lastseen) = explode(' ', $token_data[$token]);
+				$count_ham  = (int) $count_ham;
+				$count_spam = (int) $count_spam;
+
+				# Increase or decrease the right counter
+
+				if($action === b8::LEARN) {
+					if($category === b8::HAM)
+						$count_ham += $count;
+					elseif($category === b8::SPAM)
+						$count_spam += $count;
+				}
+
+				elseif($action == b8::UNLEARN) {
+					if($category === b8::HAM)
+						$count_ham -= $count;
+					elseif($category === b8::SPAM)
+						$count_spam -= $count;
+				}
+
+				# We don't want to have negative values
+
+				if($count_ham < 0)
+					$count_ham = 0;
+
+				if($count_spam < 0)
+					$count_spam = 0;
+
+				# Now let's see if we have to update or delete the token
+				if($count_ham !== 0 or $count_spam !== 0)
+					$this->_update($token, "$count_ham $count_spam " . $this->b8_config['today'], $uid);
+				else
+					$this->_del($token, $uid);
+
+			}
+
+			else {
+
+				# We don't have the token. If we unlearn a text, we can't delete it
+				# as we don't have it anyway, so just do something if we learn a text
+
+				if($action === b8::LEARN) {
+
+					if($category === b8::HAM)
+						$data = '1 0 ';
+					elseif($category === b8::SPAM)
+						$data = '0 1 ';
+
+					$data .= $this->b8_config['today'];
+
+					$this->_put($token, $data, $uid);
+
+				}
+
+			}
+
+		}
+
+		# Now, all token have been processed, so let's update the right text
+
+		if($action === b8::LEARN) {
+
+			if($category === b8::HAM) {
+				$internals['texts_ham']++;
+				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham'], $uid);
+			}
+
+			elseif($category === b8::SPAM) {
+				$internals['texts_spam']++;
+				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam'], $uid);
+			}
+
+		}
+
+		elseif($action == b8::UNLEARN) {
+
+			if($category === b8::HAM) {
+
+				$internals['texts_ham']--;
+
+				if($internals['texts_ham'] < 0)
+					$internals['texts_ham'] = 0;
+
+				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham'], $uid);
+
+			}
+
+			elseif($category === b8::SPAM) {
+
+				$internals['texts_spam']--;
+
+				if($internals['texts_spam'] < 0)
+					$internals['texts_spam'] = 0;
+
+				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam'], $uid);
+
+			}
+
+		}
+
+		# We're done and can commit all changes to the database now
+		$this->_commit($uid);
+
+	}
+
+}
+
+?>

library/spam/b8/storage/storage_base.php.ORIG

@@ -0,0 +1,395 @@
+<?php
+
+#   Copyright (C) 2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * Functions used by all storage backends
+ * Copyright (C) 2010 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Tobias Leupold
+ */
+
+abstract class b8_storage_base
+{
+
+	public $connected            = FALSE;
+
+	protected $_degenerator      = NULL;
+
+	const INTERNALS_TEXTS_HAM    = 'bayes*texts.ham';
+	const INTERNALS_TEXTS_SPAM   = 'bayes*texts.spam';
+	const INTERNALS_DBVERSION    = 'bayes*dbversion';
+
+	const BACKEND_NOT_CONNECTED  = 'BACKEND_NOT_CONNECTED';
+	const DATABASE_WRONG_VERSION = 'DATABASE_WRONG_VERSION';
+	const DATABASE_NOT_B8        = 'DATABASE_NOT_B8';
+
+	/**
+	 * Validates the class has all it needs to work.
+	 *
+	 * @access protected
+	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
+	 */
+
+	protected function validate()
+	{
+
+		# We set up the degenerator here, as we would have to duplicate code if it
+		# was done in the constructor of the respective storage backend.
+		$class = 'b8_degenerator_' . $this->b8_config['degenerator'];
+		$this->_degenerator = new $class();
+
+		if($this->connected !== TRUE)
+			return self::BACKEND_NOT_CONNECTED;
+
+		return TRUE;
+
+	}
+
+	/**
+	 * Checks if a b8 database is used and if it's version is okay
+	 *
+	 * @access protected
+	 * @return mixed Returns TRUE if everything is okay, otherwise an error code.
+	 */
+
+	protected function check_database()
+	{
+
+		$internals = $this->get_internals();
+
+		if(isset($internals['dbversion'])) {
+			if($internals['dbversion'] == "2") {
+				return TRUE;
+			}
+			else {
+				$this->connected = FALSE;
+				return self::DATABASE_WRONG_VERSION;
+			}
+		}
+		else {
+			$this->connected = FALSE;
+			return self::DATABASE_NOT_B8;
+		}
+
+	}
+
+	/**
+	 * Parses the "count" data of a token.
+	 *
+	 * @access private
+	 * @param string $data
+	 * @return array Returns an array of the parsed data: array(count_ham, count_spam, lastseen).
+	 */
+
+	private function _parse_count($data)
+	{
+
+		list($count_ham, $count_spam, $lastseen) = explode(' ', $data);
+
+		$count_ham  = (int) $count_ham;
+		$count_spam = (int) $count_spam;
+
+		return array(
+			'count_ham'  => $count_ham,
+			'count_spam' => $count_spam
+		);
+
+	}
+
+	/**
+	 * Get the database's internal variables.
+	 *
+	 * @access public
+	 * @return array Returns an array of all internals.
+	 */
+
+	public function get_internals()
+	{
+
+		$internals = $this->_get_query(
+			array(
+				self::INTERNALS_TEXTS_HAM,
+				self::INTERNALS_TEXTS_SPAM,
+				self::INTERNALS_DBVERSION
+			)
+		);
+
+		return array(
+			'texts_ham'  => (int) $internals[self::INTERNALS_TEXTS_HAM],
+			'texts_spam' => (int) $internals[self::INTERNALS_TEXTS_SPAM],
+			'dbversion'  => (int) $internals[self::INTERNALS_DBVERSION]
+		);
+
+	}
+
+	/**
+	 * Get all data about a list of tags from the database.
+	 *
+	 * @access public
+	 * @param array $tokens
+	 * @return mixed Returns FALSE on failure, otherwise returns array of returned data in the format array('tokens' => array(token => count), 'degenerates' => array(token => array(degenerate => count))).
+	 */
+
+	public function get($tokens)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# First we see what we have in the database.
+		$token_data = $this->_get_query($tokens);
+
+		# Check if we have to degenerate some tokens
+
+		$missing_tokens = array();
+
+		foreach($tokens as $token) {
+			if(!isset($token_data[$token]))
+				$missing_tokens[] = $token;
+		}
+
+		if(count($missing_tokens) > 0) {
+
+			# We have to degenerate some tokens
+			$degenerates_list = array();
+
+			# Generate a list of degenerated tokens for the missing tokens ...
+			$degenerates = $this->_degenerator->degenerate($missing_tokens);
+
+			# ... and look them up
+
+			foreach($degenerates as $token => $token_degenerates)
+				$degenerates_list = array_merge($degenerates_list, $token_degenerates);
+
+			$token_data = array_merge($token_data, $this->_get_query($degenerates_list));
+
+		}
+
+		# Here, we have all availible data in $token_data.
+
+		$return_data_tokens = array();
+		$return_data_degenerates = array();
+
+		foreach($tokens as $token) {
+
+			if(isset($token_data[$token]) === TRUE) {
+
+				# The token was found in the database
+
+				# Add the data ...
+				$return_data_tokens[$token] = $this->_parse_count($token_data[$token]);
+
+				# ... and update it's lastseen parameter
+				$this->_update($token, "{$return_data_tokens[$token]['count_ham']} {$return_data_tokens[$token]['count_spam']} " . $this->b8_config['today']);
+
+			}
+
+			else {
+
+				# The token was not found, so we look if we
+				# can return data for degenerated tokens
+
+				# Check all degenerated forms of the token
+
+				foreach($this->_degenerator->degenerates[$token] as $degenerate) {
+
+					if(isset($token_data[$degenerate]) === TRUE) {
+
+						# A degeneration of the token way found in the database
+
+						# Add the data ...
+						$return_data_degenerates[$token][$degenerate] = $this->_parse_count($token_data[$degenerate]);
+
+						# ... and update it's lastseen parameter
+						$this->_update($degenerate, "{$return_data_degenerates[$token][$degenerate]['count_ham']} {$return_data_degenerates[$token][$degenerate]['count_spam']} " . $this->b8_config['today']);
+
+					}
+
+				}
+
+			}
+
+		}
+
+		# Now, all token data directly found in the database is in $return_data_tokens
+		# and all data for degenerated versions is in $return_data_degenerates
+
+		# First, we commit the changes to the lastseen parameters
+		$this->_commit();
+
+		# Then, we return what we have
+		return array(
+			'tokens'      => $return_data_tokens,
+			'degenerates' => $return_data_degenerates
+		);
+
+	}
+
+	/**
+	 * Stores or deletes a list of tokens from the given category.
+	 *
+	 * @access public
+	 * @param array $tokens
+	 * @param const $category Either b8::HAM or b8::SPAM
+	 * @param const $action Either b8::LEARN or b8::UNLEARN
+	 * @return void
+	 */
+
+	public function process_text($tokens, $category, $action)
+	{
+
+		# Validate the startup
+
+		$started_up = $this->validate();
+
+		if($started_up !== TRUE)
+			return $started_up;
+
+		# No matter what we do, we first have to check what data we have.
+
+		# First get the internals, including the ham texts and spam texts counter
+		$internals = $this->get_internals();
+
+		# Then, fetch all data for all tokens we have (and update their lastseen parameters)
+		$token_data = $this->_get_query(array_keys($tokens));
+
+		# Process all tokens to learn/unlearn
+
+		foreach($tokens as $token => $count) {
+
+			if(isset($token_data[$token])) {
+
+				# We already have this token, so update it's data
+
+				# Get the existing data
+				list($count_ham, $count_spam, $lastseen) = explode(' ', $token_data[$token]);
+				$count_ham  = (int) $count_ham;
+				$count_spam = (int) $count_spam;
+
+				# Increase or decrease the right counter
+
+				if($action === b8::LEARN) {
+					if($category === b8::HAM)
+						$count_ham += $count;
+					elseif($category === b8::SPAM)
+						$count_spam += $count;
+				}
+
+				elseif($action == b8::UNLEARN) {
+					if($category === b8::HAM)
+						$count_ham -= $count;
+					elseif($category === b8::SPAM)
+						$count_spam -= $count;
+				}
+
+				# We don't want to have negative values
+
+				if($count_ham < 0)
+					$count_ham = 0;
+
+				if($count_spam < 0)
+					$count_spam = 0;
+
+				# Now let's see if we have to update or delete the token
+				if($count_ham !== 0 or $count_spam !== 0)
+					$this->_update($token, "$count_ham $count_spam " . $this->b8_config['today']);
+				else
+					$this->_del($token);
+
+			}
+
+			else {
+
+				# We don't have the token. If we unlearn a text, we can't delete it
+				# as we don't have it anyway, so just do something if we learn a text
+
+				if($action === b8::LEARN) {
+
+					if($category === b8::HAM)
+						$data = '1 0 ';
+					elseif($category === b8::SPAM)
+						$data = '0 1 ';
+
+					$data .= $this->b8_config['today'];
+
+					$this->_put($token, $data);
+
+				}
+
+			}
+
+		}
+
+		# Now, all token have been processed, so let's update the right text
+
+		if($action === b8::LEARN) {
+
+			if($category === b8::HAM) {
+				$internals['texts_ham']++;
+				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham']);
+			}
+
+			elseif($category === b8::SPAM) {
+				$internals['texts_spam']++;
+				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam']);
+			}
+
+		}
+
+		elseif($action == b8::UNLEARN) {
+
+			if($category === b8::HAM) {
+
+				$internals['texts_ham']--;
+
+				if($internals['texts_ham'] < 0)
+					$internals['texts_ham'] = 0;
+
+				$this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham']);
+
+			}
+
+			elseif($category === b8::SPAM) {
+
+				$internals['texts_spam']--;
+
+				if($internals['texts_spam'] < 0)
+					$internals['texts_spam'] = 0;
+
+				$this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam']);
+
+			}
+
+		}
+
+		# We're done and can commit all changes to the database now
+		$this->_commit();
+
+	}
+
+}
+
+?>

library/spam/b8/storage/storage_dba.php

@@ -0,0 +1,198 @@
+<?php
+
+#   Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * The DBA (Berkeley DB) abstraction layer for communicating with the database.
+ * Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Tobias Leupold
+ */
+
+class b8_storage_dba extends b8_storage_base
+{
+
+	public $config = array(
+		'database'    => 'wordlist.db',
+		'handler'     => 'db4',
+	);
+
+	public $b8_config = array(
+		'degenerator' => NULL,
+		'today'       => NULL
+	);
+
+	private $_db          = NULL;
+
+	const DATABASE_CONNECTION_FAIL = 'DATABASE_CONNECTION_FAIL';
+
+	/**
+	 * Constructs the database layer.
+	 *
+	 * @access public
+	 * @param string $config
+	 */
+
+	function __construct($config, $degenerator, $today)
+	{
+
+		# Pass some variables of the main b8 config to this class
+		$this->b8_config['degenerator'] = $degenerator;
+		$this->b8_config['today']       = $today;
+
+		# Validate the config items
+		if(count($config) > 0) {
+			foreach ($config as $name => $value) {
+				$this->config[$name] = (string) $value;
+			}
+		}
+
+	}
+
+	/**
+	 * Closes the database connection.
+	 *
+	 * @access public
+	 * @return void
+	 */
+
+	function __destruct()
+	{
+		if($this->_db !== NULL) {
+			dba_close($this->_db);
+			$this->connected = FALSE;
+		}
+	}
+
+	/**
+	 * Connect to the database and do some checks.
+	 *
+	 * @access public
+	 * @return mixed Returns TRUE on a successful database connection, otherwise returns a constant from b8.
+	 */
+
+	public function connect()
+	{
+
+		# Have we already connected?
+		if($this->_db !== NULL)
+			return TRUE;
+
+		# Open the database connection
+		$this->_db = dba_open(dirname(__FILE__) . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR . $this->config['database'], "w", $this->config['handler']);
+
+		if($this->_db === FALSE) {
+			$this->connected = FALSE;
+			$this->_db = NULL;
+			return self::DATABASE_CONNECTION_FAIL;
+		}
+
+		# Everything is okay and connected
+
+		$this->connected = TRUE;
+
+		# Let's see if this is a b8 database and the version is okay
+		return $this->check_database();
+
+	}
+
+	/**
+	 * Does the actual interaction with the database when fetching data.
+	 *
+	 * @access protected
+	 * @param array $tokens
+	 * @return mixed Returns an array of the returned data in the format array(token => data) or an empty array if there was no data.
+	 */
+
+	protected function _get_query($tokens)
+	{
+
+		$data = array();
+
+		foreach ($tokens as $token) {
+
+			$count = dba_fetch($token, $this->_db);
+
+			if($count !== FALSE)
+				$data[$token] = $count;
+
+		}
+
+		return $data;
+
+	}
+
+	/**
+	 * Store a token to the database.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @param string $count
+	 * @return bool TRUE on success or FALSE on failure
+	 */
+
+	protected function _put($token, $count) {
+		return dba_insert($token, $count, $this->_db);
+	}
+
+	/**
+	 * Update an existing token.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @param string $count
+	 * @return bool TRUE on success or FALSE on failure
+	 */
+
+	protected function _update($token, $count)
+	{
+		return dba_replace($token, $count, $this->_db);
+	}
+
+	/**
+	 * Remove a token from the database.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @return bool TRUE on success or FALSE on failure
+	 */
+
+	protected function _del($token)
+	{
+		return dba_delete($token, $this->_db);
+	}
+
+	/**
+	 * Does nothing :-D
+	 *
+	 * @access protected
+	 * @return void
+	 */
+
+	protected function _commit()
+	{
+		# We just need this function because the (My)SQL backend(s) need it.
+		return;
+	}
+
+}
+
+?>

library/spam/b8/storage/storage_frndc.php

@@ -0,0 +1,344 @@
+<?php
+
+#   Copyright (C) 2006-2011 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * The MySQL abstraction layer for communicating with the database.
+ * Copyright (C) 2009 Oliver Lillie (aka buggedcom)
+ * Copyright (C) 2010-2011 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Oliver Lillie (aka buggedcom) (original PHP 5 port and optimizations)
+ * @author Tobias Leupold
+ */
+
+class b8_storage_frndc extends b8_storage_base
+{
+
+	public $config = array(
+		'database'        => 'b8_wordlist',
+		'table_name'      => 'b8_wordlist',
+		'host'            => 'localhost',
+		'user'            => FALSE,
+		'pass'            => FALSE,
+		'connection'      => NULL
+	);
+
+	public $b8_config = array(
+		'degenerator'     => NULL,
+		'today'           => NULL
+	);
+
+	private $_connection                   = NULL;
+	private $_deletes                      = array();
+	private $_puts                         = array();
+	private $_updates                      = array();
+	private $uid                           = 0;
+
+	const DATABASE_CONNECTION_FAIL         = 'DATABASE_CONNECTION_FAIL';
+	const DATABASE_CONNECTION_ERROR        = 'DATABASE_CONNECTION_ERROR';
+	const DATABASE_CONNECTION_BAD_RESOURCE = 'DATABASE_CONNECTION_BAD_RESOURCE';
+	const DATABASE_SELECT_ERROR            = 'DATABASE_SELECT_ERROR';
+	const DATABASE_TABLE_ACCESS_FAIL       = 'DATABASE_TABLE_ACCESS_FAIL';
+	const DATABASE_WRONG_VERSION           = 'DATABASE_WRONG_VERSION';
+
+	/**
+	 * Constructs the database layer.
+	 *
+	 * @access public
+	 * @param string $config
+	 */
+
+	function __construct($config, $degenerator, $today)
+	{
+
+		# Pass some variables of the main b8 config to this class
+		$this->b8_config['degenerator'] = $degenerator;
+		$this->b8_config['today']       = $today;
+
+		# Validate the config items
+
+		if(count($config) > 0) {
+
+			foreach ($config as $name => $value) {
+
+				switch($name) {
+
+					case 'table_name':
+					case 'host':
+					case 'user':
+					case 'pass':
+					case 'database':
+						$this->config[$name] = (string) $value;
+						break;
+
+					case 'connection':
+
+						if($value !== NULL) {
+
+							if(is_resource($value) === TRUE) {
+								$resource_type = get_resource_type($value);
+								$this->config['connection'] = $resource_type !== 'mysql link' && $resource_type !== 'mysql link persistent' ? FALSE : $value;
+							}
+
+							else
+								$this->config['connection'] = FALSE;
+
+						}
+
+						break;
+
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Closes the database connection.
+	 *
+	 * @access public
+	 * @return void
+	 */
+
+	function __destruct()
+	{
+
+		if($this->_connection === NULL)
+			return;
+
+		# Commit any changes before closing
+		$this->_commit();
+
+		# Just close the connection if no link-resource was passed and b8 created it's own connection
+		if($this->config['connection'] === NULL)
+			mysql_close($this->_connection);
+
+		$this->connected = FALSE;
+
+	}
+
+	/**
+	 * Connect to the database and do some checks.
+	 *
+	 * @access public
+	 * @return mixed Returns TRUE on a successful database connection, otherwise returns a constant from b8.
+	 */
+
+	public function connect()
+	{
+
+		return TRUE;
+
+		# Are we already connected?
+		if($this->connected === TRUE)
+			return TRUE;
+
+		# Are we using an existing passed resource?
+		if($this->config['connection'] === FALSE) {
+			# ... yes we are, but the connection is not a resource, so return an error
+			$this->connected = FALSE;
+			return self::DATABASE_CONNECTION_BAD_RESOURCE;
+		}
+
+		elseif($this->config['connection'] === NULL) {
+
+			# ... no we aren't so we have to connect.
+
+			if($this->_connection = mysql_connect($this->config['host'], $this->config['user'], $this->config['pass'])) {
+				if(mysql_select_db($this->config['database'], $this->_connection) === FALSE) {
+					$this->connected = FALSE;
+					return self::DATABASE_SELECT_ERROR . ": " . mysql_error();
+				}
+			}
+			else {
+				$this->connected = FALSE;
+				return self::DATABASE_CONNECTION_ERROR;
+			}
+
+		}
+
+		else {
+			# ... yes we are
+			$this->_connection = $this->config['connection'];
+		}
+
+		# Just in case ...
+		if($this->_connection === NULL) {
+			$this->connected = FALSE;
+			return self::DATABASE_CONNECTION_FAIL;
+		}
+
+		# Check to see if the wordlist table exists
+		if(mysql_query('DESCRIBE ' . $this->config['table_name'], $this->_connection) === FALSE) {
+			$this->connected = FALSE;
+			return self::DATABASE_TABLE_ACCESS_FAIL . ": " . mysql_error();
+		}
+
+		# Everything is okay and connected
+		$this->connected = TRUE;
+
+		# Let's see if this is a b8 database and the version is okay
+		return $this->check_database();
+
+	}
+
+	/**
+	 * Does the actual interaction with the database when fetching data.
+	 *
+	 * @access protected
+	 * @param array $tokens
+	 * @return mixed Returns an array of the returned data in the format array(token => data) or an empty array if there was no data.
+	 */
+
+	protected function _get_query($tokens, $uid)
+	{
+
+		# Construct the query ...
+
+		if(count($tokens) > 0) {
+
+			$where = array();
+
+			foreach ($tokens as $token) {
+				$token = dbesc($token);
+				array_push($where, $token);
+			}
+
+			$where = 'token IN ("' . implode('", "', $where) . '")';
+		}
+
+		else {
+			$token = dbesc($token);
+			$where = 'token = "' . $token . '"';
+		}
+
+		# ... and fetch the data
+
+		$result = q('
+			SELECT token, count
+			FROM ' . $this->config['table_name'] . '
+			WHERE ' . $where . ' AND uid = ' . $uid );
+
+		return $result;
+
+	}
+
+	/**
+	 * Store a token to the database.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @param string $count
+	 * @return void
+	 */
+
+	protected function _put($token, $count, $uid) {
+		$token = dbesc($token);
+		$count = dbesc($count);
+		$uid = dbesc($uid);
+		array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
+	}
+
+	/**
+	 * Update an existing token.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @param string $count
+	 * @return void
+	 */
+
+	protected function _update($token, $count, $uid)
+	{
+		$token = dbesc($token);
+		$count = dbesc($count);
+		$uid = dbesc($uid);
+		array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
+	}
+
+	/**
+	 * Remove a token from the database.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @return void
+	 */
+
+	protected function _del($token, $uid)
+	{
+		$token = dbesc($token);
+		$uid = dbesc($uid);
+		$this->uid = $uid;
+		array_push($this->_deletes, $token);
+	}
+
+	/**
+	 * Commits any modification queries.
+	 *
+	 * @access protected
+	 * @return void
+	 */
+
+	protected function _commit($uid)
+	{
+
+		if(count($this->_deletes) > 0) {
+
+			$result = q('
+				DELETE FROM ' . $this->config['table_name'] . '
+				WHERE token IN ("' . implode('", "', $this->_deletes) . '") AND uid = ' . $this->uid);
+
+			$this->_deletes = array();
+
+		}
+
+		if(count($this->_puts) > 0) {
+
+			$result = q('
+				INSERT INTO ' . $this->config['table_name'] . '(token, count, uid)
+				VALUES ' . implode(', ', $this->_puts));
+
+			$this->_puts = array();
+
+		}
+
+		if(count($this->_updates) > 0) {
+
+			// this still needs work
+			$result = q("select * from " . $this->config['table_name'] . ' where token = ';
+
+			
+			$result = q('
+				INSERT INTO ' . $this->config['table_name'] . '(token, count, uid)
+				VALUES ' . implode(', ', $this->_updates) . ', ' . $uid . '
+				ON DUPLICATE KEY UPDATE ' . $this->config['table_name'] . '.count = VALUES(count);', $this->_connection);
+
+			$this->_updates = array();
+
+		}
+
+	}
+
+}
+
+?>

library/spam/b8/storage/storage_mysql.php

@@ -0,0 +1,351 @@
+<?php
+
+#   Copyright (C) 2006-2011 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+/**
+ * The MySQL abstraction layer for communicating with the database.
+ * Copyright (C) 2009 Oliver Lillie (aka buggedcom)
+ * Copyright (C) 2010-2011 Tobias Leupold <tobias.leupold@web.de>
+ *
+ * @license LGPL
+ * @access public
+ * @package b8
+ * @author Oliver Lillie (aka buggedcom) (original PHP 5 port and optimizations)
+ * @author Tobias Leupold
+ */
+
+class b8_storage_mysql extends b8_storage_base
+{
+
+	public $config = array(
+		'database'        => 'b8_wordlist',
+		'table_name'      => 'b8_wordlist',
+		'host'            => 'localhost',
+		'user'            => FALSE,
+		'pass'            => FALSE,
+		'connection'      => NULL
+	);
+
+	public $b8_config = array(
+		'degenerator'     => NULL,
+		'today'           => NULL
+	);
+
+	private $_connection                   = NULL;
+	private $_deletes                      = array();
+	private $_puts                         = array();
+	private $_updates                      = array();
+
+	const DATABASE_CONNECTION_FAIL         = 'DATABASE_CONNECTION_FAIL';
+	const DATABASE_CONNECTION_ERROR        = 'DATABASE_CONNECTION_ERROR';
+	const DATABASE_CONNECTION_BAD_RESOURCE = 'DATABASE_CONNECTION_BAD_RESOURCE';
+	const DATABASE_SELECT_ERROR            = 'DATABASE_SELECT_ERROR';
+	const DATABASE_TABLE_ACCESS_FAIL       = 'DATABASE_TABLE_ACCESS_FAIL';
+	const DATABASE_WRONG_VERSION           = 'DATABASE_WRONG_VERSION';
+
+	/**
+	 * Constructs the database layer.
+	 *
+	 * @access public
+	 * @param string $config
+	 */
+
+	function __construct($config, $degenerator, $today)
+	{
+
+		# Pass some variables of the main b8 config to this class
+		$this->b8_config['degenerator'] = $degenerator;
+		$this->b8_config['today']       = $today;
+
+		# Validate the config items
+
+		if(count($config) > 0) {
+
+			foreach ($config as $name => $value) {
+
+				switch($name) {
+
+					case 'table_name':
+					case 'host':
+					case 'user':
+					case 'pass':
+					case 'database':
+						$this->config[$name] = (string) $value;
+						break;
+
+					case 'connection':
+
+						if($value !== NULL) {
+
+							if(is_resource($value) === TRUE) {
+								$resource_type = get_resource_type($value);
+								$this->config['connection'] = $resource_type !== 'mysql link' && $resource_type !== 'mysql link persistent' ? FALSE : $value;
+							}
+
+							else
+								$this->config['connection'] = FALSE;
+
+						}
+
+						break;
+
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Closes the database connection.
+	 *
+	 * @access public
+	 * @return void
+	 */
+
+	function __destruct()
+	{
+
+		if($this->_connection === NULL)
+			return;
+
+		# Commit any changes before closing
+		$this->_commit();
+
+		# Just close the connection if no link-resource was passed and b8 created it's own connection
+		if($this->config['connection'] === NULL)
+			mysql_close($this->_connection);
+
+		$this->connected = FALSE;
+
+	}
+
+	/**
+	 * Connect to the database and do some checks.
+	 *
+	 * @access public
+	 * @return mixed Returns TRUE on a successful database connection, otherwise returns a constant from b8.
+	 */
+
+	public function connect()
+	{
+
+		# Are we already connected?
+		if($this->connected === TRUE)
+			return TRUE;
+
+		# Are we using an existing passed resource?
+		if($this->config['connection'] === FALSE) {
+			# ... yes we are, but the connection is not a resource, so return an error
+			$this->connected = FALSE;
+			return self::DATABASE_CONNECTION_BAD_RESOURCE;
+		}
+
+		elseif($this->config['connection'] === NULL) {
+
+			# ... no we aren't so we have to connect.
+
+			if($this->_connection = mysql_connect($this->config['host'], $this->config['user'], $this->config['pass'])) {
+				if(mysql_select_db($this->config['database'], $this->_connection) === FALSE) {
+					$this->connected = FALSE;
+					return self::DATABASE_SELECT_ERROR . ": " . mysql_error();
+				}
+			}
+			else {
+				$this->connected = FALSE;
+				return self::DATABASE_CONNECTION_ERROR;
+			}
+
+		}
+
+		else {
+			# ... yes we are
+			$this->_connection = $this->config['connection'];
+		}
+
+		# Just in case ...
+		if($this->_connection === NULL) {
+			$this->connected = FALSE;
+			return self::DATABASE_CONNECTION_FAIL;
+		}
+
+		# Check to see if the wordlist table exists
+		if(mysql_query('DESCRIBE ' . $this->config['table_name'], $this->_connection) === FALSE) {
+			$this->connected = FALSE;
+			return self::DATABASE_TABLE_ACCESS_FAIL . ": " . mysql_error();
+		}
+
+		# Everything is okay and connected
+		$this->connected = TRUE;
+
+		# Let's see if this is a b8 database and the version is okay
+		return $this->check_database();
+
+	}
+
+	/**
+	 * Does the actual interaction with the database when fetching data.
+	 *
+	 * @access protected
+	 * @param array $tokens
+	 * @return mixed Returns an array of the returned data in the format array(token => data) or an empty array if there was no data.
+	 */
+
+	protected function _get_query($tokens)
+	{
+
+		# Construct the query ...
+
+		if(count($tokens) > 0) {
+
+			$where = array();
+
+			foreach ($tokens as $token) {
+				$token = mysql_real_escape_string($token, $this->_connection);
+				array_push($where, $token);
+			}
+
+			$where = 'token IN ("' . implode('", "', $where) . '")';
+		}
+
+		else {
+			$token = mysql_real_escape_string($token, $this->_connection);
+			$where = 'token = "' . $token . '"';
+		}
+
+		# ... and fetch the data
+
+		$result = mysql_query('
+			SELECT token, count
+			FROM ' . $this->config['table_name'] . '
+			WHERE ' . $where . ';
+		', $this->_connection);
+
+		$data = array();
+
+		while ($row = mysql_fetch_array($result, MYSQL_ASSOC))
+			$data[$row['token']] = $row['count'];
+
+		mysql_free_result($result);
+
+		return $data;
+
+	}
+
+	/**
+	 * Store a token to the database.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @param string $count
+	 * @return void
+	 */
+
+	protected function _put($token, $count) {
+		$token = mysql_real_escape_string($token, $this->_connection);
+		$count = mysql_real_escape_string($count, $this->_connection);;
+		array_push($this->_puts, '("' . $token . '", "' . $count . '")');
+	}
+
+	/**
+	 * Update an existing token.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @param string $count
+	 * @return void
+	 */
+
+	protected function _update($token, $count)
+	{
+		$token = mysql_real_escape_string($token, $this->_connection);
+		$count = mysql_real_escape_string($count, $this->_connection);
+		array_push($this->_updates, '("' . $token . '", "' . $count . '")');
+	}
+
+	/**
+	 * Remove a token from the database.
+	 *
+	 * @access protected
+	 * @param string $token
+	 * @return void
+	 */
+
+	protected function _del($token)
+	{
+		$token = mysql_real_escape_string($token, $this->_connection);
+		array_push($this->_deletes, $token);
+	}
+
+	/**
+	 * Commits any modification queries.
+	 *
+	 * @access protected
+	 * @return void
+	 */
+
+	protected function _commit()
+	{
+
+		if(count($this->_deletes) > 0) {
+
+			$result = mysql_query('
+				DELETE FROM ' . $this->config['table_name'] . '
+				WHERE token IN ("' . implode('", "', $this->_deletes) . '");
+			', $this->_connection);
+
+			if(is_resource($result) === TRUE)
+				mysql_free_result($result);
+
+			$this->_deletes = array();
+
+		}
+
+		if(count($this->_puts) > 0) {
+
+			$result = mysql_query('
+				INSERT INTO ' . $this->config['table_name'] . '(token, count)
+				VALUES ' . implode(', ', $this->_puts) . ';', $this->_connection);
+
+			if(is_resource($result) === TRUE)
+				mysql_free_result($result);
+
+			$this->_puts = array();
+
+		}
+
+		if(count($this->_updates) > 0) {
+
+			$result = mysql_query('
+				INSERT INTO ' . $this->config['table_name'] . '(token, count)
+				VALUES ' . implode(', ', $this->_updates) . '
+				ON DUPLICATE KEY UPDATE ' . $this->config['table_name'] . '.count = VALUES(count);', $this->_connection);
+
+			if(is_resource($result) === TRUE)
+				mysql_free_result($result);
+
+			$this->_updates = array();
+
+		}
+
+	}
+
+}
+
+?>

library/spam/doc/COPYING

@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

library/spam/doc/ChangeLog

@@ -0,0 +1,179 @@
+2010-12-30 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.5.1
+
+	* Bigger changes:
+		- Fixed some issues with the scope of variables leading to problems when multiple instances of b8 are created. Thanks to Mike Creuzer for the bug report :-)
+		- Centralized the loading of class definition files in the b8 constructor and created a function to handle the inclusion.
+
+	* b8.php: Return a lexer error code instead of a rating if the lexer failed. The lexer never returned FALSE but b8 checked only for this value to validate the lexer didn't fail. Thanks to Matt Friedman for the bug report :-)
+
+	* lexer/lexer_default.php: A bit of code cleanup: less useless nesting.
+
+	* doc/readme.*: Updated the documentation, added a FAQ.
+
+2010-06-27 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.5-r1
+
+	* doc/readme.*: Updated the documentation; forgot the newly introduced b8::HAM and b8::SPAM variables. Added some additional information about the storage model.
+
+2010-06-02 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.5
+
+	* 100.000 Changes (new major release!), at a glance:
+		- No PHP 4 compatibility anymore. Much cleaner code base with less hacks.
+		- Completely reworked storage model. The SQL performance increased dramatically, the Berkeley DB performance remains as fast as it always has been.
+		- Better lexer which can also handle non-latin1 texts in a nice way, so that e. g. Cyrillic or Chinese texts can be classified more performant.
+		- No config files anymore, multiple instances of b8 can be now created in the same script with different configuration, databases and no problems.
+		- No spooky administration interface anymore that needs an SQL database, even if Berkeley DB is used (anybody who actually used this?! I never did ;-).
+		- No "install" scripts and routines and a less end-user compatible documentation. Anybody integrating b8 in his homepage won't be an end-user, will he?
+
+2009-02-03 Oliver Lillie (aka buggedcom)
+
+	* Revision: 221 (the original PHP 5 port)
+
+	* Rewrote Tobias' original class for optimisation and PHP 5 functionality.
+
+	* Improved database mysql query useage by over ~820%
+
+	* Class is faster, ~20%.
+
+	* Slight increase in memory usage, but it's small and given the advantages of the speed increase and query reduction it's worth it.
+
+	* Removed install code from mysql class and added a sql file. Anyone who wants to use this is generally going to be more advanced anyway and see the sql to install.
+
+2009-02-03 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.4.4 -- changed the license type from GPL to LGPL
+
+2008-06-27 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.4.3 -- no bugs found ... so let's make a release with only small changes ;-)
+
+	* b8.php: Removed debugging messages that were commented out anyway
+
+	* storage/storage_mysql.php: Made it possible to pass both a MySQL-link resource and a table name to b8. This makes b8 useable in the Redaxo CMS (and probably others)
+
+	* doc/readme.htm: Updated documentation accordingly
+
+2008-02-17 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.4.2
+
+	* interface/backup.php: the bayes*dbversion tag is now written to a database emptied by drop(), so that it will be useable without an error message even if no backup is recovered afterwards.
+
+	* doc/readme.htm: added a security note to the configuration section (htaccess should be used to avoid everybody to be able to see the configuration)
+
+2007-09-17 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.4.1
+
+	* storage/storage_mysql.php: fixed b8 crashing when getting passed a persistent MySQL resource link. Thanks to Paul Chapman for the bug report :-)
+
+2007-06-08 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.4
+
+	* Let's go the whole hog. b8's class is now "b8" and no more "bayes", and all internal variables have now according names.
+
+	* Reworked the whole (surprisingly crappy) implementation of b8. No more global() calls, everything happens inside the classes now. Made that whole stuff really object oriented (as good as possible with PHP's poor OOP model ;-).
+
+	* No more PHP code in the configuration files.
+
+	* Created an extra lexer class. This is now also configurable.
+
+	* Storage classes now can create their own databases when this is requested by the configuration.
+
+	* MySQL calls are no random shots anymore: either, a MySQL-link resource is passed to b8 on startup which will be used for the queries, or the class sets up it's own link. Same for SQLite.
+
+	* The interface now uses a separate storage backend capable of SQL. In this way, we _really_ can query the database for e. g. an ordered list of tokens. After doing what we wanted with this work database, the b8 database can be synced with it.
+
+	* Added a lot of verbose error handling.
+
+	* Fixed a dumb error: all tokens from a text were used for the spamminess calculation, because two for() loops both used $i as their counter. D'oh!!! Now, the filter's performance is way better.
+
+	* Catched on the way how that whole math stuff works a little more ;-) Now, the calculation of the single probabilities proposed by Mr. Robinson does a little more the stuff it was intended to do, because ...
+
+	* Made some calculation constants parameters: the number of tokens to use, the default rating for unknown tokens and Gary Robinson's s constant.
+
+	* Introduced an optional minimum deviation that a token's rating must have to be considered in the spamminess calculation.
+
+	* The default extreme ratings for tokens only in ham or spam are now optional. One can also choose to calculate all ratings by Mr. Robinson's method.
+
+	* Noticed that text primary keys are not case sensitive by default in MySQL, which has a noticeable impact on the filter's performance. Informed the MySQL users about that.
+
+	* The whole code sucks much less ;-) b8 should be way more user friendly now.
+
+	* Re-wrote the whole documentation.
+
+	* Fixed the ChangeLog :-)
+
+2007-02-08 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.3.3 again ;-)
+
+	* bayes-php is now b8. See http://www.nasauber.de/blog/text.php?text=58 for details :-) Thanks to Tobias Lang (http://langt.net/) for this cool new name!
+
+2007-01-05 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.3.3
+
+	* Renamed the internal BerkeleyDB handle from "$db" to the less general name "$bayes_php_db" due to an collision with phpwcms's (http://www.phpwcms.de/) global $db variable and potentially other php programs.
+
+	* Commented out Laurent Goussard's SQLite storage class by default, as it's try { } catch { } calls break PHP 4
+
+2006-09-03 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.3.2
+
+	* Laurent Goussard (loranger@free.fr) contributed an SQLite storage class(which needs PHP 5).
+
+	* I finally added my eMail address to the sources ;-)
+
+2006-07-24 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.3.1
+
+	* Fixed a problem in the unlearn() function: If a text was unlearned that wasn't learned before (accidentaly), it could happen that the count parameter for this text was smaller than 0, breaking the spamminess calulation
+
+2006-07-02 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.3
+
+	* Improved the get_tokens() function; the filter should now be a lot more performant, especially with short texts
+
+	* Added the "lastseen" parameter for each token to make the database maintainable (outdated tokens can be deleted)
+
+	* Added a real database maintainance interface
+
+2006-06-12 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.2.1
+
+	* Fixed a problem in get_tokens() (if it was called more than once, tokens were counted more often than they appeared in the text)
+
+	* Slightly enhanced the default index.php interface: after learning a text as Ham or Spam, the rating before and after it is displayed to inform the user about it
+
+2006-05-21 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.2
+
+	* Comments now in English (to pretend international success of bayes-php ;-)
+
+	* Recommendations of Paul Graham's article "Better Bayesian Filtering" ( http://www.paulgraham.com/better.html ) are now considered: Tokens that only appear in Ham or Spam and not in the other category are rated with 0.9998 or 0.0002 if they were less than 10 times in Ham or Spam and with 0.9999 or 0.0001 if they appeared more that 10 times. This should allow the filter to differentiate spam texts more sharp from ham texts. Also, token "degeneration" as described in the article is performed for unknown tokens to estimate their spamminess.
+
+	* The database connect is now swapped in a separate configuration file, so only this file has to be preserved if bayes-php is updated and only this file has to be changed to configure the script.
+
+2006-03-29 Tobias Leupold <tobias.leupold@web.de>
+
+	* Release: Version 0.1.1
+
+	* get_tokens() beachtet jetzt auch HTML-Tags und Wörter mit Akzenten und Apostrophen
+
+	* Verschiedene Kleinigkeiten "sauber" gemacht :-)
+
+2006-03-05 Tobias Leupold <tobias.leupold@web.de>
+
+	* Added 2007-06-08: Initial release (Version 0.1)

library/spam/doc/readme.htm

@@ -0,0 +1,707 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
+<title>b8: readme</title>
+<meta name="author" content="Tobias Leupold" />
+<meta name="date" content="2010-12-23" />
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 6253 2010-03-02 00:24:53Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: left }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="b8-readme">
+<h1 class="title">b8: readme</h1>
+<table class="docinfo" frame="void" rules="none">
+<col class="docinfo-name" />
+<col class="docinfo-content" />
+<tbody valign="top">
+<tr><th class="docinfo-name">Author:</th>
+<td>Tobias Leupold</td></tr>
+<tr class="field"><th class="docinfo-name">Homepage:</th><td class="field-body"><a class="reference external" href="http://nasauber.de/">http://nasauber.de/</a></td>
+</tr>
+<tr><th class="docinfo-name">Contact:</th>
+<td><a class="first last reference external" href="mailto:tobias.leupold&#64;web.de">tobias.leupold&#64;web.de</a></td></tr>
+<tr><th class="docinfo-name">Date:</th>
+<td>2010-12-23</td></tr>
+</tbody>
+</table>
+<div class="contents topic" id="table-of-contents">
+<p class="topic-title first">Table of Contents</p>
+<ul class="auto-toc simple">
+<li><a class="reference internal" href="#description-of-b8" id="id18">1&nbsp;&nbsp;&nbsp;Description of b8</a><ul class="auto-toc">
+<li><a class="reference internal" href="#what-is-b8" id="id19">1.1&nbsp;&nbsp;&nbsp;What is b8?</a></li>
+<li><a class="reference internal" href="#how-does-it-work" id="id20">1.2&nbsp;&nbsp;&nbsp;How does it work?</a></li>
+<li><a class="reference internal" href="#what-do-i-need-for-it" id="id21">1.3&nbsp;&nbsp;&nbsp;What do I need for it?</a></li>
+<li><a class="reference internal" href="#what-s-different" id="id22">1.4&nbsp;&nbsp;&nbsp;What's different?</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#update-from-prior-versions" id="id23">2&nbsp;&nbsp;&nbsp;Update from prior versions</a><ul class="auto-toc">
+<li><a class="reference internal" href="#update-from-bayes-php-version-0-2-1-or-earlier" id="id24">2.1&nbsp;&nbsp;&nbsp;Update from bayes-php version 0.2.1 or earlier</a></li>
+<li><a class="reference internal" href="#update-from-bayes-php-version-0-3-or-later" id="id25">2.2&nbsp;&nbsp;&nbsp;Update from bayes-php version 0.3 or later</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#installation" id="id26">3&nbsp;&nbsp;&nbsp;Installation</a></li>
+<li><a class="reference internal" href="#configuration" id="id27">4&nbsp;&nbsp;&nbsp;Configuration</a><ul class="auto-toc">
+<li><a class="reference internal" href="#b8-s-base-configuration" id="id28">4.1&nbsp;&nbsp;&nbsp;b8's base configuration</a></li>
+<li><a class="reference internal" href="#configuration-of-the-storage-backend" id="id29">4.2&nbsp;&nbsp;&nbsp;Configuration of the storage backend</a><ul class="auto-toc">
+<li><a class="reference internal" href="#settings-for-the-berkeley-db-dba-backend" id="id30">4.2.1&nbsp;&nbsp;&nbsp;Settings for the Berkeley DB (DBA) backend</a></li>
+<li><a class="reference internal" href="#settings-for-the-mysql-backend" id="id31">4.2.2&nbsp;&nbsp;&nbsp;Settings for the MySQL backend</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#using-b8" id="id32">5&nbsp;&nbsp;&nbsp;Using b8</a><ul class="auto-toc">
+<li><a class="reference internal" href="#setting-up-a-new-database" id="id33">5.1&nbsp;&nbsp;&nbsp;Setting up a new database</a><ul class="auto-toc">
+<li><a class="reference internal" href="#setting-up-a-new-berkeley-db" id="id34">5.1.1&nbsp;&nbsp;&nbsp;Setting up a new Berkeley DB</a></li>
+<li><a class="reference internal" href="#setting-up-a-new-mysql-table" id="id35">5.1.2&nbsp;&nbsp;&nbsp;Setting up a new MySQL table</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#using-b8-in-your-scripts" id="id36">5.2&nbsp;&nbsp;&nbsp;Using b8 in your scripts</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#tips-on-operation" id="id37">6&nbsp;&nbsp;&nbsp;Tips on operation</a></li>
+<li><a class="reference internal" href="#closing" id="id38">7&nbsp;&nbsp;&nbsp;Closing</a></li>
+<li><a class="reference internal" href="#references" id="id39">8&nbsp;&nbsp;&nbsp;References</a></li>
+<li><a class="reference internal" href="#appendix" id="id40">9&nbsp;&nbsp;&nbsp;Appendix</a><ul class="auto-toc">
+<li><a class="reference internal" href="#faq" id="id41">9.1&nbsp;&nbsp;&nbsp;FAQ</a><ul class="auto-toc">
+<li><a class="reference internal" href="#what-about-more-than-two-categories" id="id42">9.1.1&nbsp;&nbsp;&nbsp;What about more than two categories?</a></li>
+<li><a class="reference internal" href="#what-about-a-list-with-words-to-ignore" id="id43">9.1.2&nbsp;&nbsp;&nbsp;What about a list with words to ignore?</a></li>
+<li><a class="reference internal" href="#why-is-it-called-b8" id="id44">9.1.3&nbsp;&nbsp;&nbsp;Why is it called &quot;b8&quot;?</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#about-the-database" id="id45">9.2&nbsp;&nbsp;&nbsp;About the database</a><ul class="auto-toc">
+<li><a class="reference internal" href="#the-database-layout" id="id46">9.2.1&nbsp;&nbsp;&nbsp;The database layout</a></li>
+<li><a class="reference internal" href="#the-lastseen-parameter" id="id47">9.2.2&nbsp;&nbsp;&nbsp;The &quot;lastseen&quot; parameter</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="description-of-b8">
+<h1><a class="toc-backref" href="#id18">1&nbsp;&nbsp;&nbsp;Description of b8</a></h1>
+<div class="section" id="what-is-b8">
+<h2><a class="toc-backref" href="#id19">1.1&nbsp;&nbsp;&nbsp;What is b8?</a></h2>
+<p>b8 is a spam filter implemented in <a class="reference external" href="http://www.php.net/">PHP</a>. It is intended to keep your weblog or guestbook spam-free. The filter can be used anywhere in your PHP code and tells you whether a text is spam or not, using statistical text analysis. See <a class="reference internal" href="#how-does-it-work">How does it work?</a> for details about this. To be able to do this, b8 first has to learn some spam and some ham example texts to decide what's good and what's not. If it makes mistakes classifying unknown texts, they can be corrected and b8 learns from the corrections, getting better with each learned text.</p>
+<p>At the moment of this writing, b8 has classified 14411 guestbook entries and weblog comments on my homepage since december 2006. 131 were ham. 39 spam texts (0.27 %) have been rated as ham (false negatives), with not even one false positive (ham message classified as spam). This results in a sensitivity of 99.73 % (the probability that a spam text will actually be rated as spam) and a specifity of 100 % (the probability that a ham text will actually be rated as ham) for me. I hope, you'll get the same good results :-)</p>
+<p>Basically, b8 is a statistical (&quot;Bayesian&quot;<a class="footnote-reference" href="#id2" id="id1">[1]</a>) spam filter like <a class="reference external" href="http://bogofilter.sourceforge.net/">Bogofilter</a> or <a class="reference external" href="http://spambayes.sourceforge.net/">SpamBayes</a>, but it is not intended to classify e-mails. When I started to write b8, I didn't find a good PHP spam filter (or any spam filter that wasn't just some example code how one <em>could</em> implement a Bayesian spam filter in PHP) that was intended to filter weblog or guestbook entries. That's why I had to write my own ;-) <br />
+Caused by it's purpose, the way b8 works is slightly different from most of the Bayesian email spam filters out there. See <a class="reference internal" href="#what-s-different">What's different?</a> if you're interested in the details.</p>
+<table class="docutils footnote" frame="void" id="id2" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id1">[1]</a></td><td>A mathematician told me that the math in b8 actually does not use Bayes' theorem but some derived algorithms that are just related to it. So … let's simply believe that and stop claiming b8 was a <em>Bayesian</em> spam filter ;-)</td></tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="how-does-it-work">
+<h2><a class="toc-backref" href="#id20">1.2&nbsp;&nbsp;&nbsp;How does it work?</a></h2>
+<p>b8  basically uses the math and technique described in Paul Graham's article &quot;A Plan For Spam&quot; <a class="footnote-reference" href="#planforspam" id="id3">[2]</a> to distinguish ham and spam. The improvements proposed in Graham's article &quot;Better Bayesian Filtering&quot; <a class="footnote-reference" href="#betterbayesian" id="id4">[3]</a> and Gary Robinson's article &quot;Spam Detection&quot; <a class="footnote-reference" href="#spamdetection" id="id5">[4]</a> have also been considered. See also the article &quot;A Statistical Approach to the Spam Problem&quot; <a class="footnote-reference" href="#statisticalapproach" id="id6">[5]</a>.</p>
+<p>b8 cuts the text to classify to pieces, extracting stuff like e-mail addresses, links and HTML tags. For each such token, it calculates a single probability for a text containing it being spam, based on what the filter has learned so far. When the token was not seen before, b8 tries to find similar ones using the &quot;degeneration&quot; described in <a class="footnote-reference" href="#betterbayesian" id="id7">[3]</a> and uses the most relevant value found. If really nothing is found, b8 assumes a default rating for this token for the further calculations. <br />
+Then, b8 takes the most relevant values (which have a rating far from 0.5, which would mean we don't know what it is) and calculates the probability that the whole text is spam by the inverse chi-square function described in <a class="footnote-reference" href="#spamdetection" id="id8">[4]</a>.
+There are some parameters that can be set which influence the filter's behaviour (see below).</p>
+<p>In short words: you give b8 a text and it returns a value between 0 and 1, saying it's ham when it's near 0 and saying it's spam when it's near 1.</p>
+</div>
+<div class="section" id="what-do-i-need-for-it">
+<h2><a class="toc-backref" href="#id21">1.3&nbsp;&nbsp;&nbsp;What do I need for it?</a></h2>
+<p>Not much! You just need PHP 5 on the server where b8 will be used (b8 version 0.5 finally dropped PHP 4 compatibility – thankfully ;-) and a proper storage possibility for the wordlists. I strongly recommend using <a class="reference external" href="http://www.oracle.com/database/berkeley-db/index.html">Berkeley DB</a>. See below how you can check if you can use it and why you should use it. If the server's PHP wasn't compiled with Berkeley DB support, a <a class="reference external" href="http://mysql.com/">MySQL</a> table can be used alternatively.</p>
+</div>
+<div class="section" id="what-s-different">
+<h2><a class="toc-backref" href="#id22">1.4&nbsp;&nbsp;&nbsp;What's different?</a></h2>
+<p>b8 is designed to classify weblog or guestbook entries, not e-mails. For this reason, it uses a slightly different technique than most of the other statistical spam filters out there use.</p>
+<p>My experience was that spam entries on my weblog or guestbook were often quite short, sometimes just something like &quot;123abc&quot; as text and a link to a suspect homepage. Some spam bots don't even made a difference between e. g. the &quot;name&quot; and &quot;text&quot; fields and posted their text as email address, for example. Considering this, b8 just takes one string to classify, making no difference between &quot;headers&quot; and &quot;text&quot;. <br />
+The other thing is that most statistical spam filters count one token one time, no matter how often it appears in the text (as Graham describes it in <a class="footnote-reference" href="#planforspam" id="id9">[2]</a>). b8 does count how often a token was seen and learns or considers this. Additionally, the number of learned ham and spam texts are saved and used as the calculation base for the single probabilities. Why this? Because a text containing one link (no matter where it points to, just indicated by a &quot;http://&quot; or a &quot;www.&quot;) might not be spam, but a text containing 20 links might be.</p>
+<p>This means that b8 might be good for classifying weblog or guestbook entries (I really think it is ;-) – but very likely, it will work quite poor when being used for something else (like classifying e-mails). But as said above, for this task, there are a lot of very good filters out there to choose from.</p>
+</div>
+</div>
+<div class="section" id="update-from-prior-versions">
+<h1><a class="toc-backref" href="#id23">2&nbsp;&nbsp;&nbsp;Update from prior versions</a></h1>
+<p>If this is a new b8 installation, read on at the <a class="reference internal" href="#installation">Installation</a> section!</p>
+<div class="section" id="update-from-bayes-php-version-0-2-1-or-earlier">
+<h2><a class="toc-backref" href="#id24">2.1&nbsp;&nbsp;&nbsp;Update from bayes-php version 0.2.1 or earlier</a></h2>
+<p>Please first follow the database update instructions of the bayes-php-0.3 release if you update from a version prior to bayes-php-0.3 and then read the following paragraph about updating from a version &lt;0.3.3.</p>
+</div>
+<div class="section" id="update-from-bayes-php-version-0-3-or-later">
+<h2><a class="toc-backref" href="#id25">2.2&nbsp;&nbsp;&nbsp;Update from bayes-php version 0.3 or later</a></h2>
+<dl class="docutils">
+<dt><strong>You use Berkeley DB?</strong></dt>
+<dd>Everything's fine, you can simply continue using your database.</dd>
+<dt><strong>You use MySQL?</strong></dt>
+<dd>The <tt class="docutils literal">CREATE</tt> statement of b8's wordlist has changed. The best is probably to create a dump via your favorite administration tool or script, create the new table and re-insert all data. The layout is still the same: there's one &quot;token&quot; column and one &quot;data&quot; column. Having done that, you can keep using your data.</dd>
+<dt><strong>You use SQLite?</strong></dt>
+<dd>Sorry, at the moment, there's no SQLite backend for b8. But we're working on it :-)</dd>
+</dl>
+<p>The configuration model of b8 has changed.  Please read through the <a class="reference internal" href="#configuration">Configuration</a> section and update your configuration accordingly.</p>
+<p>b8's lexer has been partially re-written. It should now be able to handle all kind of non-latin-1 input, like cyrillic, chinese or japanese texts. Caused by this fact, much more tokens will be recognized when classifying such texts. Therefore, you could get different results in b8's ratings, even if the same database is used and although the math is still the same.</p>
+<p>b8 0.5 introduced two constants that can be used in the <tt class="docutils literal">learn()</tt> and <tt class="docutils literal">unlearn()</tt> functions: <tt class="docutils literal"><span class="pre">b8::HAM</span></tt> and <tt class="docutils literal"><span class="pre">b8::SPAM</span></tt>. The literal values &quot;ham&quot; and &quot;spam&quot; can still be used anyway.</p>
+</div>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id26">3&nbsp;&nbsp;&nbsp;Installation</a></h1>
+<p>Installing b8 on your server is quite easy. You just have to provide the needed files. To do this, you could just upload the whole <tt class="docutils literal">b8</tt> subdirectory to the base directory of your homepage. It contains the filter itself and all needed backend classes. The other directories (<tt class="docutils literal">doc</tt>, <tt class="docutils literal">example</tt> and <tt class="docutils literal">install</tt>) are not used by b8.</p>
+<p>That's it ;-)</p>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id27">4&nbsp;&nbsp;&nbsp;Configuration</a></h1>
+<p>The configuration is passed as arrays when instantiating a new b8 object. Two arrays can be passed to b8, one containing b8's base configuration and some settings for the lexer (which should be common for all lexer classes, in case some other lexer than the default one will be written one day) and one for the storage backend. <br />
+You can have a look at <tt class="docutils literal">example/index.php</tt> to see how this can be done. <a class="reference internal" href="#using-b8-in-your-scripts">Using b8 in your scripts</a> also shows example code showing how b8 can be included in a PHP script.</p>
+<p>Not all values have to be set. When some values are missing, the default ones will be used. If you do use the default settings, you don't have to pass them to b8.</p>
+<div class="section" id="b8-s-base-configuration">
+<h2><a class="toc-backref" href="#id28">4.1&nbsp;&nbsp;&nbsp;b8's base configuration</a></h2>
+<p>All these values can be set in the &quot;config_b8&quot; array (the first parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the first argument.</p>
+<p>These are some basic settings telling b8 which backend classes to use:</p>
+<blockquote>
+<dl class="docutils">
+<dt><strong>storage</strong></dt>
+<dd><p class="first">This defines which storage backend will be used to save b8's wordlist. Currently, two backends are available: <a class="reference external" href="http://www.oracle.com/database/berkeley-db/index.html">Berkeley DB</a> (<tt class="docutils literal">dba</tt>) and <a class="reference external" href="http://mysql.com/">MySQL</a> (<tt class="docutils literal">mysql</tt>). At the moment, b8 does not support <a class="reference external" href="http://sqlite.org/">SQLite</a> (as the previous version did), but it will be (hopefully) re-added in one of the next releases. The default is <tt class="docutils literal">dba</tt> (string).</p>
+<dl class="docutils">
+<dt><em>Berkeley DB</em></dt>
+<dd>This is the preferred storage backend. It was the original backend for the filter and remains the most performant. b8's storage model is optimized for this database, as it is really fast and fits perfectly to what the filter needs to do the job. All content is saved in a single file, you don't need special user rights or a database server. <br />
+If you don't know whether your server's PHP can use a Berkeley DB, simply run the script <tt class="docutils literal">install/setup_berkeleydb.php</tt>. If it shows a Berkeley DB handler, please use this backend.</dd>
+<dt><em>MySQL</em></dt>
+<dd>As some webspace hosters don't allow using a Berkeley DB (but please be sure to check if you can use it!), but most do provide a MySQL server, using a MySQL table for the wordlist is provided as an alternative storage method. As said above, b8 was always intended to use a Berkeley DB. It doesn't use or need SQL to query the database. So, very likely, this will work less performant, produce a lot of unnecessary overhead and waste computing power. But it will do fine anyway!</dd>
+</dl>
+<p class="last">See <a class="reference internal" href="#configuration-of-the-storage-backend">Configuration of the storage backend</a> for the settings of the chosen backend.</p>
+</dd>
+<dt><strong>degenerator</strong></dt>
+<dd>The degenerator class to be used. See <a class="reference internal" href="#how-does-it-work">How does it work?</a> and <a class="footnote-reference" href="#betterbayesian" id="id12">[3]</a> if you're interested in what &quot;degeneration&quot; is. Defaults to <tt class="docutils literal">default</tt> (string). At the moment, only one degenerator exists, so you probably don't want to change this unless you have written your own degenerator.</dd>
+<dt><strong>lexer</strong></dt>
+<dd><p class="first">The lexer class to be used. Defaults to <tt class="docutils literal">default</tt> (string). At the moment, only one lexer exists, so you probably don't want to change this unless you have written your own lexer.</p>
+<p>The behaviour of the lexer can be additionally configured with the following variables:</p>
+<blockquote class="last">
+<dl class="docutils">
+<dt><strong>min_size</strong></dt>
+<dd>The minimal length for a token to be considered when calculating the rating of a text. Defaults to <tt class="docutils literal">3</tt> (integer).</dd>
+<dt><strong>max_size</strong></dt>
+<dd>The maximal length for a token to be considered when calculating the rating of a text. Defaults to <tt class="docutils literal">30</tt> (integer).</dd>
+<dt><strong>allow_numbers</strong></dt>
+<dd>Should pure numbers also be considered? Defaults to <tt class="docutils literal">FALSE</tt> (boolean).</dd>
+</dl>
+</blockquote>
+</dd>
+</dl>
+</blockquote>
+<p>The following settings influence the mathematical internals of b8. If you want to experiment, feel free to play around with them; but be warned: wrong settings of these values will result in poor performance or could even &quot;short-circuit&quot; the filter. <br />
+Leave these values as they are unless you know what you are doing!</p>
+<p>The &quot;Statistical discussion about b8&quot; <a class="footnote-reference" href="#b8statistic" id="id13">[6]</a> shows why the default values are the default ones.</p>
+<blockquote>
+<dl class="docutils">
+<dt><strong>use_relevant</strong></dt>
+<dd>This tells b8 how many tokens should be used when calculating the spamminess of a text. The default setting is <tt class="docutils literal">15</tt> (integer). This seems to be a quite reasonable value. When using to many tokens, the filter will fail on texts filled with useless stuff or with passages from a newspaper, etc. not being very spammish. <br />
+The tokens counted multiple times (see above) are added in addition to this value. They don't replace other ratings.</dd>
+<dt><strong>min_dev</strong></dt>
+<dd>This defines a minimum deviation from 0.5 that a token's rating must have to be considered when calculating the spamminess. Tokens with a rating closer to 0.5 than this value will simply be skipped. <br />
+If you don't want to use this feature, set this to <tt class="docutils literal">0</tt>. Defaults to <tt class="docutils literal">0.2</tt> (float). Read <a class="footnote-reference" href="#b8statistic" id="id14">[6]</a> before increasing this.</dd>
+<dt><strong>rob_x</strong></dt>
+<dd>This is Gary Robinson's <em>x</em> constant (cf. <a class="footnote-reference" href="#spamdetection" id="id15">[4]</a>). A completely unknown token will be rated with the value of <tt class="docutils literal">rob_x</tt>. The default <tt class="docutils literal">0.5</tt> (float) seems to be quite reasonable, as we can't say if a token that also can't be rated by degeneration is good or bad. <br />
+If you receive much more spam than ham or vice versa, you could change this setting accordingly.</dd>
+<dt><strong>rob_s</strong></dt>
+<dd>This is Gary Robinson's <em>s</em> constant. This is essentially the probability that the <em>rob_x</em> value is correct for a completely unknown token. It will also shift the probability of rarely seen tokens towards this value. The default is <tt class="docutils literal">0.3</tt> (float) <br />
+See <a class="footnote-reference" href="#spamdetection" id="id16">[4]</a> for a closer description of the <em>s</em> constant and read <a class="footnote-reference" href="#b8statistic" id="id17">[6]</a> for specific information about this constant in b8's algorithms.</dd>
+</dl>
+</blockquote>
+</div>
+<div class="section" id="configuration-of-the-storage-backend">
+<h2><a class="toc-backref" href="#id29">4.2&nbsp;&nbsp;&nbsp;Configuration of the storage backend</a></h2>
+<p>All the following values can be set in the &quot;config_database&quot; array (the second parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the second argument.</p>
+<div class="section" id="settings-for-the-berkeley-db-dba-backend">
+<h3><a class="toc-backref" href="#id30">4.2.1&nbsp;&nbsp;&nbsp;Settings for the Berkeley DB (DBA) backend</a></h3>
+<dl class="docutils">
+<dt><strong>database</strong></dt>
+<dd>The filename of the database file, relative to the location of <tt class="docutils literal">b8.php</tt>. Defaults to <tt class="docutils literal">wordlist.db</tt> (string).</dd>
+<dt><strong>handler</strong></dt>
+<dd>The DBA handler to use (cf. <a class="reference external" href="http://php.net/manual/en/dba.requirements.php">the PHP documentation</a> and <a class="reference internal" href="#setting-up-a-new-berkeley-db">Setting up a new Berkeley DB</a>). Defaults to <tt class="docutils literal">db4</tt> (string).</dd>
+</dl>
+</div>
+<div class="section" id="settings-for-the-mysql-backend">
+<h3><a class="toc-backref" href="#id31">4.2.2&nbsp;&nbsp;&nbsp;Settings for the MySQL backend</a></h3>
+<dl class="docutils">
+<dt><strong>database</strong></dt>
+<dd>The database containing b8's wordlist table. Defaults to <tt class="docutils literal">b8_wordlist</tt> (string).</dd>
+<dt><strong>table_name</strong></dt>
+<dd>The table containing b8's wordlist. Defaults to <tt class="docutils literal">b8_wordlist</tt> (string).</dd>
+<dt><strong>host</strong></dt>
+<dd>The host of the MySQL server. Defaults to <tt class="docutils literal">localhost</tt> (string).</dd>
+<dt><strong>user</strong></dt>
+<dd>The user name used to open the database connection. Defaults to <tt class="docutils literal">FALSE</tt> (boolean).</dd>
+<dt><strong>pass</strong></dt>
+<dd>The password required to open the database connection. Defaults to <tt class="docutils literal">FALSE</tt> (boolean).</dd>
+<dt><strong>connection</strong></dt>
+<dd>An existing MySQL link-resource that can be used by b8. Defaults to <tt class="docutils literal">NULL</tt> (NULL).</dd>
+</dl>
+</div>
+</div>
+</div>
+<div class="section" id="using-b8">
+<h1><a class="toc-backref" href="#id32">5&nbsp;&nbsp;&nbsp;Using b8</a></h1>
+<p>Now, that everything is configured, you can start to use b8. A sample script that shows what can be done with the filter exists in <tt class="docutils literal">example/index.php</tt>. The best thing for testing how all this works is to use this script before using b8 in your own scripts.</p>
+<p>Before you can start, you have to setup a database so that b8 can store a wordlist.</p>
+<div class="section" id="setting-up-a-new-database">
+<h2><a class="toc-backref" href="#id33">5.1&nbsp;&nbsp;&nbsp;Setting up a new database</a></h2>
+<div class="section" id="setting-up-a-new-berkeley-db">
+<h3><a class="toc-backref" href="#id34">5.1.1&nbsp;&nbsp;&nbsp;Setting up a new Berkeley DB</a></h3>
+<p>I wrote a script to setup a new Berkeley DB for b8. It is located in <tt class="docutils literal">install/setup_berkeleydb.php</tt>. Just run this script on your server and be sure that the directory containing it has the proper access rights set so that the server's HTTP server user or PHP user can create a new file in it (probably <tt class="docutils literal">0777</tt>). The script is quite self-explaining, just run it.</p>
+<p>Of course, you can also create a Berkeley DB by hand. In this case, you just have to insert three keys:</p>
+<pre class="literal-block">
+bayes*dbversion  =&gt; 2
+bayes*texts.ham  =&gt; 0
+bayes*texts.spam =&gt; 0
+</pre>
+<p>Be sure to set the right DBA handler in the storage backend configuration if it's not <tt class="docutils literal">db4</tt>.</p>
+</div>
+<div class="section" id="setting-up-a-new-mysql-table">
+<h3><a class="toc-backref" href="#id35">5.1.2&nbsp;&nbsp;&nbsp;Setting up a new MySQL table</a></h3>
+<p>The SQL file <tt class="docutils literal">install/setup_mysql.sql</tt> contains both the create statement for the wordlist table of b8 and the <tt class="docutils literal">INSERT</tt> statements for adding the necessary internal variables.</p>
+<p>Simply change the table name according to your needs (or leave it as it is ;-) and run the SQL to setup a b8 wordlist MySQL table.</p>
+</div>
+</div>
+<div class="section" id="using-b8-in-your-scripts">
+<h2><a class="toc-backref" href="#id36">5.2&nbsp;&nbsp;&nbsp;Using b8 in your scripts</a></h2>
+<p>Just have a look at the example script located in <tt class="docutils literal">example/index.php</tt> to see how you can include b8 in your scripts. Essentially, this strips down to:</p>
+<pre class="literal-block">
+# Include the b8 code
+require &quot;{$_SERVER['DOCUMENT_ROOT']}/b8/b8.php&quot;;
+
+# Do some configuration
+
+$config_b8 = array(
+        'some_key' =&gt; 'some_value',
+        'foo' =&gt; 'bar'
+);
+
+$config_database = array(
+        'some_key' =&gt; 'some_value',
+        'foo' =&gt; 'bar'
+);
+
+# Create a new b8 instance
+$b8 = new b8($config_b8, $config_database);
+</pre>
+<p>b8 provides three functions in an object oriented way (called e. g. via <tt class="docutils literal"><span class="pre">$b8-&gt;classify($text)</span></tt>):</p>
+<dl class="docutils">
+<dt><strong>learn($text, $category)</strong></dt>
+<dd>This saves the reference text <tt class="docutils literal">$text</tt> (string) in the category <tt class="docutils literal">$category</tt> (b8 constant). <br />
+b8 0.5 introduced two constants that can be used as <tt class="docutils literal">$category</tt>: <tt class="docutils literal"><span class="pre">b8::HAM</span></tt> and <tt class="docutils literal"><span class="pre">b8::SPAM</span></tt>. To be downward compatible with older versions of b8, the literal values &quot;ham&quot; and &quot;spam&quot; (case-sensitive strings) can still be used here.</dd>
+<dt><strong>unlearn($text, $category)</strong></dt>
+<dd>This function just exists to delete a text from a category in which is has been stored accidentally before. It deletes the reference text <tt class="docutils literal">$text</tt> (string) from the category <tt class="docutils literal">$category</tt> (either the constants <tt class="docutils literal"><span class="pre">b8::HAM</span></tt> or <tt class="docutils literal"><span class="pre">b8::SPAM</span></tt> or the literal case-sensitive strings &quot;ham&quot; or &quot;spam&quot; – cf. above). <br />
+<strong>Don't delete a spam text from ham after saving it in spam or vice versa, as long you don't have stored it accidentally in the wrong category before!</strong> This will not improve performance, quite the opposite: it will actually break the filter after a time, as the counter for saved ham or spam texts will reach 0, although you have ham or spam tokens stored: the filter will try to remove texts from the ham or spam data which have never been stored there, decrease the counter for tokens which are found just skip the non-existing words.</dd>
+<dt><strong>classify($text)</strong></dt>
+<dd>This function takes the text <tt class="docutils literal">$text</tt> (string), calculates it's probability for being spam it and returns a value between 0 and 1 (float). <br />
+A value close to 0 says the text is more likely ham and a value close to 1 says the text is more likely spam. What to do with this value is <em>your</em> business ;-) See also <a class="reference internal" href="#tips-on-operation">Tips on operation</a> below.</dd>
+</dl>
+</div>
+</div>
+<div class="section" id="tips-on-operation">
+<h1><a class="toc-backref" href="#id37">6&nbsp;&nbsp;&nbsp;Tips on operation</a></h1>
+<p>Before b8 can decide whether a text is spam or ham, you have to tell it what you consider as spam or ham. At least one learned spam or one learned ham text is needed to calculate anything. To get good ratings, you need both learned ham and learned spam texts, the more the better. <br />
+What's considered as &quot;ham&quot; or &quot;spam&quot; can be very different, depending on the operation site. On my homepage, practically each and every text posted in English or using cyrillic letters is spam. On an English or Russian homepage, this will be not the case. So I think it's not really meaningful to provide some &quot;spam data&quot; to start. Just train b8 with &quot;your&quot; spam and ham.</p>
+<p>For the practical use, I advise to give the filter all data availible. E. g. name, email address, homepage, IP address und of course the text itself should be stored in a variable (e. g. separated with an <tt class="docutils literal">\n</tt> or just a space or tab after each block) and then be classified. The learning should also be done with all data availible. <br />
+Saving the IP address is probably only meaningful for spam entries, because spammers often use the same IP address multiple times. In principle, you can leave out the IP of ham entries.</p>
+<p>You can use b8 e. g. in a guestbook script and let it classify the text before saving it. Everyone has to decide which rating is necessary to classify a text as &quot;spam&quot;, but a rating of &gt;= 0.8 seems to be reasonable for me. If one expects the spam to be in another language that the ham entries or the spams are very short normally, one could also think about a limit of 0.7. <br />
+The email filters out there mostly use &gt; 0.9 or even &gt; 0.99; but keep in mind that they have way more data to analyze in most of the cases. A guestbook entry may be quite short, especially when it's spam.</p>
+<p>In my opinion, a autolearn function is very handy. I save spam messages with a rating higher than 0.7 but less than 0.9 automatically as spam. I don't do this with ham messages in an automated way to prevent the filter from saving a false negative as ham and then classifying and learning all the spam as ham when I'm on holidays ;-)</p>
+</div>
+<div class="section" id="closing">
+<h1><a class="toc-backref" href="#id38">7&nbsp;&nbsp;&nbsp;Closing</a></h1>
+<p>So … that's it. Thanks for using b8! If you find a bug or have an idea how to make b8 better, let me know. I'm also always looking forward to get e-mails from people using b8 on their homepages :-)</p>
+</div>
+<div class="section" id="references">
+<h1><a class="toc-backref" href="#id39">8&nbsp;&nbsp;&nbsp;References</a></h1>
+<table class="docutils footnote" frame="void" id="planforspam" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[2]</td><td><em>(<a class="fn-backref" href="#id3">1</a>, <a class="fn-backref" href="#id9">2</a>)</em> Paul Graham, <em>A Plan For Spam</em> (<a class="reference external" href="http://paulgraham.com/spam.html">http://paulgraham.com/spam.html</a>)</td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="betterbayesian" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[3]</td><td><em>(<a class="fn-backref" href="#id4">1</a>, <a class="fn-backref" href="#id7">2</a>, <a class="fn-backref" href="#id12">3</a>)</em> Paul Graham, <em>Better Bayesian Filtering</em> (<a class="reference external" href="http://paulgraham.com/better.html">http://paulgraham.com/better.html</a>)</td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="spamdetection" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[4]</td><td><em>(<a class="fn-backref" href="#id5">1</a>, <a class="fn-backref" href="#id8">2</a>, <a class="fn-backref" href="#id15">3</a>, <a class="fn-backref" href="#id16">4</a>)</em> Gary Robinson, <em>Spam Detection</em> (<a class="reference external" href="http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.html">http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.html</a>)</td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="statisticalapproach" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id6">[5]</a></td><td><em>A Statistical Approach to the Spam Problem</em> (<a class="reference external" href="http://linuxjournal.com/article/6467">http://linuxjournal.com/article/6467</a>)</td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="b8statistic" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[6]</td><td><em>(<a class="fn-backref" href="#id13">1</a>, <a class="fn-backref" href="#id14">2</a>, <a class="fn-backref" href="#id17">3</a>)</em> Tobias Leupold, <em>Statistical discussion about b8</em> (<a class="reference external" href="http://nasauber.de/opensource/b8/discussion/">http://nasauber.de/opensource/b8/discussion/</a>)</td></tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="appendix">
+<h1><a class="toc-backref" href="#id40">9&nbsp;&nbsp;&nbsp;Appendix</a></h1>
+<div class="section" id="faq">
+<h2><a class="toc-backref" href="#id41">9.1&nbsp;&nbsp;&nbsp;FAQ</a></h2>
+<div class="section" id="what-about-more-than-two-categories">
+<h3><a class="toc-backref" href="#id42">9.1.1&nbsp;&nbsp;&nbsp;What about more than two categories?</a></h3>
+<p>I wrote b8 with the <a class="reference external" href="http://en.wikipedia.org/wiki/KISS_principle">KISS principle</a> in mind. For the &quot;end-user&quot;, we have a class with almost no setup to do that can do three things: classify a text, learn a text and un-learn a text. Normally, there's no need to un-learn a text, so essentially, there are only two functions we need. <br />
+This simplicity is only possible because b8 only knows two categories (normally &quot;Ham&quot; and &quot;Spam&quot; or some other category pair) and tells you, in one float number between 0 and 1, if a given texts rather fits in the first or the second category. If we would support multiple categories, more work would have to be done and things would become more complicated. One would have to setup the categories, have another database layout (perhaps making it mandatory to have SQL) and one float number would not be sufficient to describe b8's output, so more code would be needed – even outside of b8.</p>
+<p>All the code, the database layout and particularly the math is intended to do exactly one thing: distinguish between two categories. I think it would be a lot of work to change b8 so that it would support more than two categories. Probably, this is possible to do, but don't ask me in which way we would have to change the math to get multiple-category support – I'm a dentist, not a mathematician ;-) <br />
+Apart from this I do believe that most people using b8 don't want or need multiple categories. They just want to know if a text is spam or not, don't they? I do, at least ;-)</p>
+<p>But let's think about the multiple-category thing. How would we calculate a rating for more than two categories? If we had a third one, let's call it &quot;<a class="reference external" href="http://en.wikipedia.org/wiki/Treet">Treet</a>&quot;, how would we calculate a rating? We could calculate three different ratings. One for &quot;Ham&quot;, one for &quot;Spam&quot; and one for &quot;Treet&quot; and choose the highest one to tell the user what category fits best for the text. This could be done by using a small wrapper script using three instances of b8 as-is and three different databases, each containing texts being &quot;Ham&quot;, &quot;Spam&quot;, &quot;Treet&quot; and the respective counterparts. <br />
+But here's the problem: if we have &quot;Ham&quot; and &quot;Spam&quot;, &quot;Spam&quot; is the counterpart of &quot;Ham&quot;. But what's the counterpart of &quot;Spam&quot; if we have more than one additional category? Where do the &quot;Non-Ham&quot;, &quot;Non-Spam&quot; and &quot;Non-Treet&quot; texts come from?</p>
+<p>Another approach, a direct calculation of more than two probabilities (the &quot;Ham&quot; probability is simply 1 minus the &quot;Spam&quot; probability, so we actually get two probabilities with the return value of b8) out of one database would require big changes in b8's structure and math.</p>
+<p>There's a project called <a class="reference external" href="http://xhtml.net/scripts/PHPNaiveBayesianFilter">PHPNaiveBayesianFilter</a> which supports multiple categories by default. The author calls his software &quot;Version 1.0&quot;, but I think this is the very first release, not a stable or mature one. The most recent change of that release dates back to 2003 according to the &quot;changed&quot; date of the files inside the zip archive, so probably, this project is dead or has never been alive and under active development at all. <br />
+Actually, I played around with that code but the results weren't really good, so I decided to write my own spam filter from scratch back in early 2006 ;-)</p>
+<p>All in all, there seems to be no easy way to implement multiple (meaning more than two) categories using b8's current code base and probably, b8 will never support more than two categories. Perhaps, a fork or a complete re-write would  be better than implementing such a feature. Anyway, I don't close my mind to multiple categories in b8. Feel free to tell me how multiple categories could be implementented in b8 or how a multiple-category version using the same code base (sharing a common abstract class?) could be written.</p>
+</div>
+<div class="section" id="what-about-a-list-with-words-to-ignore">
+<h3><a class="toc-backref" href="#id43">9.1.2&nbsp;&nbsp;&nbsp;What about a list with words to ignore?</a></h3>
+<p>Some people suggested to introduce a list with words that b8 will simply ignore. Like &quot;and&quot;, &quot;or&quot;, &quot;the&quot;, and so on. I don't think this is very meaningful.</p>
+<p>First, it would just work for the particular language that has been stored in the list. Speaking of my homepage, most of my spam is English, almost all my ham is German. So I would have to maintain a list with the probably less interesting words for at least two languages. Additionally, I get spam in Chinese, Japanese and Cyrillic writing or something else I can't read as well. What word should be ignored in those texts?  <br />
+Second, why should we ever exclude words? Who tells us those words are <em>actually</em> meaningless? If a word appears both in ham and spam, it's rating will be near 0.5 and so, it won't be used for the final calculation if a appropriate minimum deviation was set. So b8 will exclude it anyway without any blacklist. And think of this: if we excluded a word of which we only <em>think</em> it doesn't mean anything but it actually does appear more often in ham or spam, the results will get even worse.</p>
+<p>So why should we care about things we do not have to care about? ;-)</p>
+</div>
+<div class="section" id="why-is-it-called-b8">
+<h3><a class="toc-backref" href="#id44">9.1.3&nbsp;&nbsp;&nbsp;Why is it called &quot;b8&quot;?</a></h3>
+<p>The initial name for the filter was (damn creative!) &quot;bayes-php&quot;. There were two main reasons for searching another name: 1. &quot;bayes-php&quot; sucks. 2. the <a class="reference external" href="http://php.net/license/3_01.txt">PHP License</a> says the PHP guys do not like when the name of a script written in PHP contains the word &quot;PHP&quot;. Read the <a class="reference external" href="http://www.php.net/license/index.php#faq-lic">License FAQ</a> for a reasonable argumentation about this.</p>
+<p>Luckily, <a class="reference external" href="http://langt.net/">Tobias Lang</a> proposed the new name &quot;b8&quot;. And these are the reasons why I chose this name:</p>
+<ul class="simple">
+<li>&quot;bayes-php&quot; is a &quot;b&quot; followed by 8 letters.</li>
+<li>&quot;b8&quot; is short and handy. Additionally, there was no program with the name &quot;b8&quot; or &quot;bate&quot;</li>
+<li>The English verb &quot;to bate&quot; means &quot;to decrease&quot; – and that's what b8 does: it decreases the number of spam entries in your weblog or guestbook!</li>
+<li>&quot;b8&quot; just sounds way cooler than &quot;bayes-php&quot; ;-)</li>
+</ul>
+</div>
+</div>
+<div class="section" id="about-the-database">
+<h2><a class="toc-backref" href="#id45">9.2&nbsp;&nbsp;&nbsp;About the database</a></h2>
+<div class="section" id="the-database-layout">
+<h3><a class="toc-backref" href="#id46">9.2.1&nbsp;&nbsp;&nbsp;The database layout</a></h3>
+<p>The database layout is quite simple. It's just key:value for everything stored. There are three &quot;internal&quot; variables stored as normal tokens (but all containing a <tt class="docutils literal">*</tt> which is always used as a split character by the lexer, so we can't get collisions):</p>
+<dl class="docutils">
+<dt><strong>bayes*dbversion</strong></dt>
+<dd>This indicates the database's &quot;version&quot;. The first versions of b8 did not set this. Version &quot;2&quot; indicates that we have a database created by a b8 version already storing <a class="reference internal" href="#the-lastseen-parameter">the &quot;lastseen&quot; parameter</a>.</dd>
+<dt><strong>bayes*texts.ham</strong></dt>
+<dd>The number of ham texts learned.</dd>
+<dt><strong>bayes*texts.spam</strong></dt>
+<dd>The number of spam texts learned.</dd>
+</dl>
+<p>Each &quot;normal&quot; token is stored with it's literal name as the key and it's data as the value. The data consists of the count of the token in all ham and spam texts and the date when the token was used the last time, all in one string and separated by spaces. So we have the following scheme:</p>
+<pre class="literal-block">
+&quot;token&quot; =&gt; &quot;count_ham count_spam lastseen&quot;
+</pre>
+</div>
+<div class="section" id="the-lastseen-parameter">
+<h3><a class="toc-backref" href="#id47">9.2.2&nbsp;&nbsp;&nbsp;The &quot;lastseen&quot; parameter</a></h3>
+<p>Somebody looking at the code might be wondering why b8 stores this &quot;lastseen&quot; parameter. This value is not used for any calculation at the moment. Initially, it was intended to keep the database maintainable in a way that &quot;old&quot; data could be removed. When e. g. a token only appeared once in ham or spam and has not been seen for a year, one could simply delete it from the database. <br />
+I actually never used this feature (does anybody?). So probably, some changes will be done to this one day. Perhaps, I find a way to include this data in the spamminess calculation in a meaningful way, or at least for some statistics. One could also make this optional to keep the calculation effort small if this is needed.</p>
+<p>Feel free to send me any suggestions about this!</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>

library/spam/doc/readme.rst

@@ -0,0 +1,371 @@
+==========
+b8: readme
+==========
+
+:Author: Tobias Leupold
+:Homepage: http://nasauber.de/
+:Contact: tobias.leupold@web.de
+:Date: |date|
+
+.. contents:: Table of Contents
+
+Description of b8
+=================
+
+What is b8?
+-----------
+
+b8 is a spam filter implemented in `PHP <http://www.php.net/>`__. It is intended to keep your weblog or guestbook spam-free. The filter can be used anywhere in your PHP code and tells you whether a text is spam or not, using statistical text analysis. See `How does it work?`_ for details about this. To be able to do this, b8 first has to learn some spam and some ham example texts to decide what's good and what's not. If it makes mistakes classifying unknown texts, they can be corrected and b8 learns from the corrections, getting better with each learned text.
+
+At the moment of this writing, b8 has classified 14411 guestbook entries and weblog comments on my homepage since december 2006. 131 were ham. 39 spam texts (0.27 %) have been rated as ham (false negatives), with not even one false positive (ham message classified as spam). This results in a sensitivity of 99.73 % (the probability that a spam text will actually be rated as spam) and a specifity of 100 % (the probability that a ham text will actually be rated as ham) for me. I hope, you'll get the same good results :-)
+
+Basically, b8 is a statistical ("Bayesian"[#]_) spam filter like `Bogofilter <http://bogofilter.sourceforge.net/>`__ or `SpamBayes <http://spambayes.sourceforge.net/>`__, but it is not intended to classify e-mails. When I started to write b8, I didn't find a good PHP spam filter (or any spam filter that wasn't just some example code how one *could* implement a Bayesian spam filter in PHP) that was intended to filter weblog or guestbook entries. That's why I had to write my own ;-) |br|
+Caused by it's purpose, the way b8 works is slightly different from most of the Bayesian email spam filters out there. See `What's different?`_ if you're interested in the details.
+
+.. [#] A mathematician told me that the math in b8 actually does not use Bayes' theorem but some derived algorithms that are just related to it. So … let's simply believe that and stop claiming b8 was a *Bayesian* spam filter ;-)
+
+How does it work?
+-----------------
+
+b8  basically uses the math and technique described in Paul Graham's article "A Plan For Spam" [#planforspam]_ to distinguish ham and spam. The improvements proposed in Graham's article "Better Bayesian Filtering" [#betterbayesian]_ and Gary Robinson's article "Spam Detection" [#spamdetection]_ have also been considered. See also the article "A Statistical Approach to the Spam Problem" [#statisticalapproach]_.
+
+b8 cuts the text to classify to pieces, extracting stuff like e-mail addresses, links and HTML tags. For each such token, it calculates a single probability for a text containing it being spam, based on what the filter has learned so far. When the token was not seen before, b8 tries to find similar ones using the "degeneration" described in [#betterbayesian]_ and uses the most relevant value found. If really nothing is found, b8 assumes a default rating for this token for the further calculations. |br|
+Then, b8 takes the most relevant values (which have a rating far from 0.5, which would mean we don't know what it is) and calculates the probability that the whole text is spam by the inverse chi-square function described in [#spamdetection]_.
+There are some parameters that can be set which influence the filter's behaviour (see below).
+
+In short words: you give b8 a text and it returns a value between 0 and 1, saying it's ham when it's near 0 and saying it's spam when it's near 1.
+
+What do I need for it?
+----------------------
+
+Not much! You just need PHP 5 on the server where b8 will be used (b8 version 0.5 finally dropped PHP 4 compatibility – thankfully ;-) and a proper storage possibility for the wordlists. I strongly recommend using `Berkeley DB <http://www.oracle.com/database/berkeley-db/index.html>`_. See below how you can check if you can use it and why you should use it. If the server's PHP wasn't compiled with Berkeley DB support, a `MySQL <http://mysql.com/>`_ table can be used alternatively.
+
+What's different?
+-----------------
+
+b8 is designed to classify weblog or guestbook entries, not e-mails. For this reason, it uses a slightly different technique than most of the other statistical spam filters out there use.
+
+My experience was that spam entries on my weblog or guestbook were often quite short, sometimes just something like "123abc" as text and a link to a suspect homepage. Some spam bots don't even made a difference between e. g. the "name" and "text" fields and posted their text as email address, for example. Considering this, b8 just takes one string to classify, making no difference between "headers" and "text". |br|
+The other thing is that most statistical spam filters count one token one time, no matter how often it appears in the text (as Graham describes it in [#planforspam]_). b8 does count how often a token was seen and learns or considers this. Additionally, the number of learned ham and spam texts are saved and used as the calculation base for the single probabilities. Why this? Because a text containing one link (no matter where it points to, just indicated by a "\h\t\t\p\:\/\/" or a "www.") might not be spam, but a text containing 20 links might be.
+
+This means that b8 might be good for classifying weblog or guestbook entries (I really think it is ;-) – but very likely, it will work quite poor when being used for something else (like classifying e-mails). But as said above, for this task, there are a lot of very good filters out there to choose from.
+
+Update from prior versions
+==========================
+
+If this is a new b8 installation, read on at the `Installation`_ section!
+
+Update from bayes-php version 0.2.1 or earlier
+----------------------------------------------
+
+Please first follow the database update instructions of the bayes-php-0.3 release if you update from a version prior to bayes-php-0.3 and then read the following paragraph about updating from a version <0.3.3.
+
+Update from bayes-php version 0.3 or later
+------------------------------------------
+
+**You use Berkeley DB?**
+	Everything's fine, you can simply continue using your database.
+
+**You use MySQL?**
+	The ``CREATE`` statement of b8's wordlist has changed. The best is probably to create a dump via your favorite administration tool or script, create the new table and re-insert all data. The layout is still the same: there's one "token" column and one "data" column. Having done that, you can keep using your data.
+
+**You use SQLite?**
+	Sorry, at the moment, there's no SQLite backend for b8. But we're working on it :-)
+
+The configuration model of b8 has changed.  Please read through the `Configuration`_ section and update your configuration accordingly.
+
+b8's lexer has been partially re-written. It should now be able to handle all kind of non-latin-1 input, like cyrillic, chinese or japanese texts. Caused by this fact, much more tokens will be recognized when classifying such texts. Therefore, you could get different results in b8's ratings, even if the same database is used and although the math is still the same.
+
+b8 0.5 introduced two constants that can be used in the ``learn()`` and ``unlearn()`` functions: ``b8::HAM`` and ``b8::SPAM``. The literal values "ham" and "spam" can still be used anyway.
+
+Installation
+============
+
+Installing b8 on your server is quite easy. You just have to provide the needed files. To do this, you could just upload the whole ``b8`` subdirectory to the base directory of your homepage. It contains the filter itself and all needed backend classes. The other directories (``doc``, ``example`` and ``install``) are not used by b8.
+
+That's it ;-)
+
+Configuration
+=============
+
+The configuration is passed as arrays when instantiating a new b8 object. Two arrays can be passed to b8, one containing b8's base configuration and some settings for the lexer (which should be common for all lexer classes, in case some other lexer than the default one will be written one day) and one for the storage backend. |br|
+You can have a look at ``example/index.php`` to see how this can be done. `Using b8 in your scripts`_ also shows example code showing how b8 can be included in a PHP script.
+
+Not all values have to be set. When some values are missing, the default ones will be used. If you do use the default settings, you don't have to pass them to b8.
+
+b8's base configuration
+-----------------------
+
+All these values can be set in the "config_b8" array (the first parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the first argument.
+
+These are some basic settings telling b8 which backend classes to use:
+
+	**storage**
+		This defines which storage backend will be used to save b8's wordlist. Currently, two backends are available: `Berkeley DB <http://www.oracle.com/database/berkeley-db/index.html>`_ (``dba``) and `MySQL <http://mysql.com/>`_ (``mysql``). At the moment, b8 does not support `SQLite <http://sqlite.org/>`_ (as the previous version did), but it will be (hopefully) re-added in one of the next releases. The default is ``dba`` (string).
+
+		*Berkeley DB*
+			This is the preferred storage backend. It was the original backend for the filter and remains the most performant. b8's storage model is optimized for this database, as it is really fast and fits perfectly to what the filter needs to do the job. All content is saved in a single file, you don't need special user rights or a database server. |br|
+			If you don't know whether your server's PHP can use a Berkeley DB, simply run the script ``install/setup_berkeleydb.php``. If it shows a Berkeley DB handler, please use this backend.
+
+		*MySQL*
+			As some webspace hosters don't allow using a Berkeley DB (but please be sure to check if you can use it!), but most do provide a MySQL server, using a MySQL table for the wordlist is provided as an alternative storage method. As said above, b8 was always intended to use a Berkeley DB. It doesn't use or need SQL to query the database. So, very likely, this will work less performant, produce a lot of unnecessary overhead and waste computing power. But it will do fine anyway!
+
+		See `Configuration of the storage backend`_ for the settings of the chosen backend.
+
+	**degenerator**
+		The degenerator class to be used. See `How does it work?`_ and [#betterbayesian]_ if you're interested in what "degeneration" is. Defaults to ``default`` (string). At the moment, only one degenerator exists, so you probably don't want to change this unless you have written your own degenerator.
+
+	**lexer**
+		The lexer class to be used. Defaults to ``default`` (string). At the moment, only one lexer exists, so you probably don't want to change this unless you have written your own lexer.
+
+		The behaviour of the lexer can be additionally configured with the following variables:
+
+			**min_size**
+				The minimal length for a token to be considered when calculating the rating of a text. Defaults to ``3`` (integer).
+
+			**max_size**
+				The maximal length for a token to be considered when calculating the rating of a text. Defaults to ``30`` (integer).
+
+			**allow_numbers**
+				Should pure numbers also be considered? Defaults to ``FALSE`` (boolean).
+
+The following settings influence the mathematical internals of b8. If you want to experiment, feel free to play around with them; but be warned: wrong settings of these values will result in poor performance or could even "short-circuit" the filter. |br|
+Leave these values as they are unless you know what you are doing!
+
+The "Statistical discussion about b8" [#b8statistic]_ shows why the default values are the default ones.
+
+	**use_relevant**
+		This tells b8 how many tokens should be used when calculating the spamminess of a text. The default setting is ``15`` (integer). This seems to be a quite reasonable value. When using to many tokens, the filter will fail on texts filled with useless stuff or with passages from a newspaper, etc. not being very spammish. |br|
+		The tokens counted multiple times (see above) are added in addition to this value. They don't replace other ratings.
+
+	**min_dev**
+		This defines a minimum deviation from 0.5 that a token's rating must have to be considered when calculating the spamminess. Tokens with a rating closer to 0.5 than this value will simply be skipped. |br|
+		If you don't want to use this feature, set this to ``0``. Defaults to ``0.2`` (float). Read [#b8statistic]_ before increasing this.
+
+	**rob_x**
+		This is Gary Robinson's *x* constant (cf. [#spamdetection]_). A completely unknown token will be rated with the value of ``rob_x``. The default ``0.5`` (float) seems to be quite reasonable, as we can't say if a token that also can't be rated by degeneration is good or bad. |br|
+		If you receive much more spam than ham or vice versa, you could change this setting accordingly.
+
+	**rob_s**
+		This is Gary Robinson's *s* constant. This is essentially the probability that the *rob_x* value is correct for a completely unknown token. It will also shift the probability of rarely seen tokens towards this value. The default is ``0.3`` (float) |br|
+		See [#spamdetection]_ for a closer description of the *s* constant and read [#b8statistic]_ for specific information about this constant in b8's algorithms.
+
+Configuration of the storage backend
+------------------------------------
+
+All the following values can be set in the "config_database" array (the second parameter) passed to b8. The name of the array doesn't matter (of course), it just has to be the second argument.
+
+Settings for the Berkeley DB (DBA) backend
+``````````````````````````````````````````
+**database**
+	The filename of the database file, relative to the location of ``b8.php``. Defaults to ``wordlist.db`` (string).
+
+**handler**
+	The DBA handler to use (cf. `the PHP documentation <http://php.net/manual/en/dba.requirements.php>`_ and `Setting up a new Berkeley DB`_). Defaults to ``db4`` (string).
+
+Settings for the MySQL backend
+``````````````````````````````
+
+**database**
+	The database containing b8's wordlist table. Defaults to ``b8_wordlist`` (string).
+
+**table_name**
+	The table containing b8's wordlist. Defaults to ``b8_wordlist`` (string).
+
+**host**
+	The host of the MySQL server. Defaults to ``localhost`` (string).
+
+**user**
+	The user name used to open the database connection. Defaults to ``FALSE`` (boolean).
+
+**pass**
+	The password required to open the database connection. Defaults to ``FALSE`` (boolean).
+
+**connection**
+	An existing MySQL link-resource that can be used by b8. Defaults to ``NULL`` (NULL).
+
+Using b8
+========
+
+Now, that everything is configured, you can start to use b8. A sample script that shows what can be done with the filter exists in ``example/index.php``. The best thing for testing how all this works is to use this script before using b8 in your own scripts.
+
+Before you can start, you have to setup a database so that b8 can store a wordlist.
+
+Setting up a new database
+-------------------------
+
+Setting up a new Berkeley DB
+````````````````````````````
+
+I wrote a script to setup a new Berkeley DB for b8. It is located in ``install/setup_berkeleydb.php``. Just run this script on your server and be sure that the directory containing it has the proper access rights set so that the server's HTTP server user or PHP user can create a new file in it (probably ``0777``). The script is quite self-explaining, just run it.
+
+Of course, you can also create a Berkeley DB by hand. In this case, you just have to insert three keys:
+
+::
+
+	bayes*dbversion  => 2
+	bayes*texts.ham  => 0
+	bayes*texts.spam => 0
+
+Be sure to set the right DBA handler in the storage backend configuration if it's not ``db4``.
+
+Setting up a new MySQL table
+````````````````````````````
+
+The SQL file ``install/setup_mysql.sql`` contains both the create statement for the wordlist table of b8 and the ``INSERT`` statements for adding the necessary internal variables.
+
+Simply change the table name according to your needs (or leave it as it is ;-) and run the SQL to setup a b8 wordlist MySQL table.
+
+Using b8 in your scripts
+------------------------
+
+Just have a look at the example script located in ``example/index.php`` to see how you can include b8 in your scripts. Essentially, this strips down to:
+
+::
+
+	# Include the b8 code
+	require "{$_SERVER['DOCUMENT_ROOT']}/b8/b8.php";
+
+	# Do some configuration
+
+	$config_b8 = array(
+		'some_key' => 'some_value',
+		'foo' => 'bar'
+	);
+
+	$config_database = array(
+		'some_key' => 'some_value',
+		'foo' => 'bar'
+	);
+
+	# Create a new b8 instance
+	$b8 = new b8($config_b8, $config_database);
+
+b8 provides three functions in an object oriented way (called e. g. via ``$b8->classify($text)``):
+
+**learn($text, $category)**
+	This saves the reference text ``$text`` (string) in the category ``$category`` (b8 constant). |br|
+	b8 0.5 introduced two constants that can be used as ``$category``: ``b8::HAM`` and ``b8::SPAM``. To be downward compatible with older versions of b8, the literal values "ham" and "spam" (case-sensitive strings) can still be used here.
+
+**unlearn($text, $category)**
+	This function just exists to delete a text from a category in which is has been stored accidentally before. It deletes the reference text ``$text`` (string) from the category ``$category`` (either the constants ``b8::HAM`` or ``b8::SPAM`` or the literal case-sensitive strings "ham" or "spam" – cf. above). |br|
+	**Don't delete a spam text from ham after saving it in spam or vice versa, as long you don't have stored it accidentally in the wrong category before!** This will not improve performance, quite the opposite: it will actually break the filter after a time, as the counter for saved ham or spam texts will reach 0, although you have ham or spam tokens stored: the filter will try to remove texts from the ham or spam data which have never been stored there, decrease the counter for tokens which are found just skip the non-existing words.
+
+**classify($text)**
+	This function takes the text ``$text`` (string), calculates it's probability for being spam it and returns a value between 0 and 1 (float). |br|
+	A value close to 0 says the text is more likely ham and a value close to 1 says the text is more likely spam. What to do with this value is *your* business ;-) See also `Tips on operation`_ below.
+
+Tips on operation
+=================
+
+Before b8 can decide whether a text is spam or ham, you have to tell it what you consider as spam or ham. At least one learned spam or one learned ham text is needed to calculate anything. To get good ratings, you need both learned ham and learned spam texts, the more the better. |br|
+What's considered as "ham" or "spam" can be very different, depending on the operation site. On my homepage, practically each and every text posted in English or using cyrillic letters is spam. On an English or Russian homepage, this will be not the case. So I think it's not really meaningful to provide some "spam data" to start. Just train b8 with "your" spam and ham.
+
+For the practical use, I advise to give the filter all data availible. E. g. name, email address, homepage, IP address und of course the text itself should be stored in a variable (e. g. separated with an ``\n`` or just a space or tab after each block) and then be classified. The learning should also be done with all data availible. |br|
+Saving the IP address is probably only meaningful for spam entries, because spammers often use the same IP address multiple times. In principle, you can leave out the IP of ham entries.
+
+You can use b8 e. g. in a guestbook script and let it classify the text before saving it. Everyone has to decide which rating is necessary to classify a text as "spam", but a rating of >= 0.8 seems to be reasonable for me. If one expects the spam to be in another language that the ham entries or the spams are very short normally, one could also think about a limit of 0.7. |br|
+The email filters out there mostly use > 0.9 or even > 0.99; but keep in mind that they have way more data to analyze in most of the cases. A guestbook entry may be quite short, especially when it's spam.
+
+In my opinion, a autolearn function is very handy. I save spam messages with a rating higher than 0.7 but less than 0.9 automatically as spam. I don't do this with ham messages in an automated way to prevent the filter from saving a false negative as ham and then classifying and learning all the spam as ham when I'm on holidays ;-)
+
+Closing
+=======
+
+So … that's it. Thanks for using b8! If you find a bug or have an idea how to make b8 better, let me know. I'm also always looking forward to get e-mails from people using b8 on their homepages :-)
+
+References
+==========
+
+.. [#planforspam] Paul Graham, *A Plan For Spam* (http://paulgraham.com/spam.html)
+.. [#betterbayesian] Paul Graham, *Better Bayesian Filtering* (http://paulgraham.com/better.html)
+.. [#spamdetection] Gary Robinson, *Spam Detection* (http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.html)
+.. [#statisticalapproach] *A Statistical Approach to the Spam Problem* (http://linuxjournal.com/article/6467)
+.. [#b8statistic] Tobias Leupold, *Statistical discussion about b8* (http://nasauber.de/opensource/b8/discussion/)
+
+Appendix
+========
+
+FAQ
+---
+
+What about more than two categories?
+````````````````````````````````````
+
+I wrote b8 with the `KISS principle <http://en.wikipedia.org/wiki/KISS_principle>`__ in mind. For the "end-user", we have a class with almost no setup to do that can do three things: classify a text, learn a text and un-learn a text. Normally, there's no need to un-learn a text, so essentially, there are only two functions we need. |br|
+This simplicity is only possible because b8 only knows two categories (normally "Ham" and "Spam" or some other category pair) and tells you, in one float number between 0 and 1, if a given texts rather fits in the first or the second category. If we would support multiple categories, more work would have to be done and things would become more complicated. One would have to setup the categories, have another database layout (perhaps making it mandatory to have SQL) and one float number would not be sufficient to describe b8's output, so more code would be needed – even outside of b8.
+
+All the code, the database layout and particularly the math is intended to do exactly one thing: distinguish between two categories. I think it would be a lot of work to change b8 so that it would support more than two categories. Probably, this is possible to do, but don't ask me in which way we would have to change the math to get multiple-category support – I'm a dentist, not a mathematician ;-) |br|
+Apart from this I do believe that most people using b8 don't want or need multiple categories. They just want to know if a text is spam or not, don't they? I do, at least ;-)
+
+But let's think about the multiple-category thing. How would we calculate a rating for more than two categories? If we had a third one, let's call it "`Treet <http://en.wikipedia.org/wiki/Treet>`__", how would we calculate a rating? We could calculate three different ratings. One for "Ham", one for "Spam" and one for "Treet" and choose the highest one to tell the user what category fits best for the text. This could be done by using a small wrapper script using three instances of b8 as-is and three different databases, each containing texts being "Ham", "Spam", "Treet" and the respective counterparts. |br|
+But here's the problem: if we have "Ham" and "Spam", "Spam" is the counterpart of "Ham". But what's the counterpart of "Spam" if we have more than one additional category? Where do the "Non-Ham", "Non-Spam" and "Non-Treet" texts come from?
+
+Another approach, a direct calculation of more than two probabilities (the "Ham" probability is simply 1 minus the "Spam" probability, so we actually get two probabilities with the return value of b8) out of one database would require big changes in b8's structure and math.
+
+There's a project called `PHPNaiveBayesianFilter <http://xhtml.net/scripts/PHPNaiveBayesianFilter>`__ which supports multiple categories by default. The author calls his software "Version 1.0", but I think this is the very first release, not a stable or mature one. The most recent change of that release dates back to 2003 according to the "changed" date of the files inside the zip archive, so probably, this project is dead or has never been alive and under active development at all. |br|
+Actually, I played around with that code but the results weren't really good, so I decided to write my own spam filter from scratch back in early 2006 ;-)
+
+All in all, there seems to be no easy way to implement multiple (meaning more than two) categories using b8's current code base and probably, b8 will never support more than two categories. Perhaps, a fork or a complete re-write would  be better than implementing such a feature. Anyway, I don't close my mind to multiple categories in b8. Feel free to tell me how multiple categories could be implementented in b8 or how a multiple-category version using the same code base (sharing a common abstract class?) could be written.
+
+What about a list with words to ignore?
+```````````````````````````````````````
+
+Some people suggested to introduce a list with words that b8 will simply ignore. Like "and", "or", "the", and so on. I don't think this is very meaningful.
+
+First, it would just work for the particular language that has been stored in the list. Speaking of my homepage, most of my spam is English, almost all my ham is German. So I would have to maintain a list with the probably less interesting words for at least two languages. Additionally, I get spam in Chinese, Japanese and Cyrillic writing or something else I can't read as well. What word should be ignored in those texts?  |br|
+Second, why should we ever exclude words? Who tells us those words are *actually* meaningless? If a word appears both in ham and spam, it's rating will be near 0.5 and so, it won't be used for the final calculation if a appropriate minimum deviation was set. So b8 will exclude it anyway without any blacklist. And think of this: if we excluded a word of which we only *think* it doesn't mean anything but it actually does appear more often in ham or spam, the results will get even worse.
+
+So why should we care about things we do not have to care about? ;-)
+
+
+Why is it called "b8"?
+``````````````````````
+
+The initial name for the filter was (damn creative!) "bayes-php". There were two main reasons for searching another name: 1. "bayes-php" sucks. 2. the `PHP License <http://php.net/license/3_01.txt>`_ says the PHP guys do not like when the name of a script written in PHP contains the word "PHP". Read the `License FAQ <http://www.php.net/license/index.php#faq-lic>`_ for a reasonable argumentation about this.
+
+Luckily, `Tobias Lang <http://langt.net/>`_ proposed the new name "b8". And these are the reasons why I chose this name:
+
+- "bayes-php" is a "b" followed by 8 letters.
+- "b8" is short and handy. Additionally, there was no program with the name "b8" or "bate"
+- The English verb "to bate" means "to decrease" – and that's what b8 does: it decreases the number of spam entries in your weblog or guestbook!
+- "b8" just sounds way cooler than "bayes-php" ;-)
+
+About the database
+------------------
+
+The database layout
+```````````````````
+
+The database layout is quite simple. It's just key:value for everything stored. There are three "internal" variables stored as normal tokens (but all containing a ``*`` which is always used as a split character by the lexer, so we can't get collisions):
+
+**bayes*dbversion**
+	This indicates the database's "version". The first versions of b8 did not set this. Version "2" indicates that we have a database created by a b8 version already storing `the "lastseen" parameter`_.
+
+**bayes*texts.ham**
+	The number of ham texts learned.
+
+**bayes*texts.spam**
+	The number of spam texts learned.
+
+Each "normal" token is stored with it's literal name as the key and it's data as the value. The data consists of the count of the token in all ham and spam texts and the date when the token was used the last time, all in one string and separated by spaces. So we have the following scheme:
+
+::
+
+	"token" => "count_ham count_spam lastseen"
+
+The "lastseen" parameter
+````````````````````````
+
+Somebody looking at the code might be wondering why b8 stores this "lastseen" parameter. This value is not used for any calculation at the moment. Initially, it was intended to keep the database maintainable in a way that "old" data could be removed. When e. g. a token only appeared once in ham or spam and has not been seen for a year, one could simply delete it from the database. |br|
+I actually never used this feature (does anybody?). So probably, some changes will be done to this one day. Perhaps, I find a way to include this data in the spamminess calculation in a meaningful way, or at least for some statistics. One could also make this optional to keep the calculation effort small if this is needed.
+
+Feel free to send me any suggestions about this!
+
+.. |br| raw:: html
+
+   <br />
+
+.. section-numbering::
+
+.. |date| date::

library/spam/example/index.php

@@ -0,0 +1,241 @@
+<?php
+
+#   Copyright (C) 2006-2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+
+### This is an example script demonstrating how b8 can be used. ###
+
+#/*
+
+# Use this code block if you want to use Berkeley DB.
+
+# The database filename is interpreted relative to the b8.php script location.
+
+$config_b8 = array(
+	'storage' => 'dba'
+);
+
+$config_database = array(
+	'database' => 'wordlist.db',
+	'handler'  => 'db4'
+);
+
+#*/
+
+/*
+
+# Use this code block if you want to use MySQL.
+
+# An existing link resource can be passed to b8 by setting
+# $config_database['connection'] to this link resource.
+# Be sure to set your database access data otherwise!
+
+$config_b8 = array(
+	'storage' => 'mysql'
+);
+
+$config_database = array(
+	'database'   => 'test',
+	'table_name' => 'b8_wordlist',
+	'host'       => 'localhost',
+	'user'       => '',
+	'pass'       => ''
+);
+
+*/
+
+# To be able to calculate the time the classification took
+
+$time_start = NULL;
+
+function microtimeFloat()
+{
+	list($usec, $sec) = explode(" ", microtime());
+	return ((float) $usec + (float) $sec);
+}
+
+# Output a nicely colored rating
+
+function formatRating($rating)
+{
+
+	if($rating === FALSE)
+		return "<span style=\"color:red\">could not calculate spaminess</span>";
+
+	$red   = floor(255 * $rating);
+	$green = floor(255 * (1 - $rating));
+
+	return "<span style=\"color:rgb($red, $green, 0);\"><b>" . sprintf("%5f", $rating) . "</b></span>";
+
+}
+
+echo <<<END
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+
+<title>example b8 interface</title>
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+
+<meta name="dc.creator" content="Tobias Leupold" />
+<meta name="dc.rights" content="Copyright (c) by Tobias Leupold" />
+
+</head>
+
+<body>
+
+<div>
+
+<h1>example b8 interface</h1>
+
+
+END;
+
+$postedText = "";
+
+if(isset($_POST['action']) and $_POST['text'] ==  "")
+	echo "<p style=\"color:red;\"><b>Please type in a text!</b></p>\n\n";
+
+elseif(isset($_POST['action']) and $_POST['text'] !=  "") {
+
+	$time_start = microtimeFloat();
+
+	# Include the b8 code
+	require dirname(__FILE__) . "/../b8/b8.php";
+
+	# Create a new b8 instance
+	$b8 = new b8($config_b8, $config_database);
+
+	# Check if everything worked smoothly
+
+	$started_up = $b8->validate();
+
+	if($started_up !== TRUE) {
+		echo "<b>example:</b> Could not initialize b8. error code: $started_up";
+		exit;
+	}
+
+	$text = stripslashes($_POST['text']);
+	$postedText = htmlentities($text, ENT_QUOTES, 'UTF-8');
+
+	switch($_POST['action']) {
+
+		case "Classify":
+			echo "<p><b>Spaminess: " . formatRating($b8->classify($text)) . "</b></p>\n";
+			break;
+
+		case "Save as Spam":
+
+			$ratingBefore = $b8->classify($text);
+			$b8->learn($text, b8::SPAM);
+			$ratingAfter = $b8->classify($text);
+
+			echo "<p>Saved the text as Spam</p>\n\n";
+
+			echo "<div><table>\n";
+			echo "<tr><td>Classification before learning:</td><td>" . formatRating($ratingBefore) . "</td></tr>\n";
+			echo "<tr><td>Classification after learning:</td><td>"  . formatRating($ratingAfter)  . "</td></tr>\n";
+			echo "</table></div>\n\n";
+
+			break;
+
+		case "Save as Ham":
+
+			$ratingBefore = $b8->classify($text);
+			$b8->learn($text, b8::HAM);
+			$ratingAfter = $b8->classify($text);
+
+			echo "<p>Saved the text as Ham</p>\n\n";
+
+			echo "<div><table>\n";
+			echo "<tr><td>Classification before learning:</td><td>" . formatRating($ratingBefore) . "</td></tr>\n";
+			echo "<tr><td>Classification after learning:</td><td>"  . formatRating($ratingAfter)  . "</td></tr>\n";
+			echo "</table></div>\n\n";
+
+			break;
+
+		case "Delete from Spam":
+			$b8->unlearn($text, b8::SPAM);
+			echo "<p style=\"color:green\">Deleted the text from Spam</p>\n\n";
+			break;
+
+		case "Delete from Ham":
+			$b8->unlearn($text, b8::HAM);
+			echo "<p style=\"color:green\">Deleted the text from Ham</p>\n\n";
+			break;
+
+	}
+
+	$mem_used      = round(memory_get_usage() / 1048576, 5);
+	$peak_mem_used = round(memory_get_peak_usage() / 1048576, 5);
+	$time_taken    = round(microtimeFloat() - $time_start, 5);
+
+}
+
+echo <<<END
+<div>
+<form action="{$_SERVER['PHP_SELF']}" method="post">
+<div>
+<textarea name="text" cols="50" rows="16">$postedText</textarea>
+</div>
+<table>
+<tr>
+<td><input type="submit" name="action" value="Classify" /></td>
+</tr>
+<tr>
+<td><input type="submit" name="action" value="Save as Spam" /></td>
+<td><input type="submit" name="action" value="Save as Ham" /></td>
+</tr>
+<tr>
+<td><input type="submit" name="action" value="Delete from Spam" /></td>
+<td><input type="submit" name="action" value="Delete from Ham" /></td>
+</tr>
+</table>
+</form>
+</div>
+
+</div>
+
+END;
+
+if($time_start !== NULL) {
+
+echo <<<END
+<div>
+<table border="0">
+<tr><td>Memory used:     </td><td>$mem_used&thinsp;MB</td></tr>
+<tr><td>Peak memory used:</td><td>$peak_mem_used&thinsp;MB</td></tr>
+<tr><td>Time taken:      </td><td>$time_taken&thinsp;sec</td></tr>
+</table>
+</div>
+
+END;
+
+}
+
+?>
+
+</body>
+
+</html>

library/spam/install/setup_berkeleydb.php

@@ -0,0 +1,240 @@
+<?php
+
+#   Copyright (C) 2010 Tobias Leupold <tobias.leupold@web.de>
+#
+#   This file is part of the b8 package
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation in version 2.1 of the License.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+#   License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+echo <<<END
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+
+<title>b8 Berkeley DB setup</title>
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+
+<meta name="dc.creator" content="Tobias Leupold" />
+<meta name="dc.rights" content="Copyright (c) by Tobias Leupold" />
+
+</head>
+
+<body>
+
+<div>
+
+<h1>b8 Berkeley DB setup</h1>
+
+
+END;
+
+$failed = FALSE;
+
+if(isset($_POST['handler'])) {
+
+	$dbfile = $_POST['dbfile'];
+	$dbfile_directory = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']);
+
+	echo "<h2>Creating database</h2>\n\n";
+
+	echo "<p>\n";
+
+	echo "Checking database file name &hellip; ";
+
+	if($dbfile == "") {
+		echo "<span style=\"color:red;\">Please provide the name of the database file!</span><br />\n";
+		$failed = TRUE;
+	}
+	else
+		echo "$dbfile<br />\n";
+
+	if(!$failed) {
+
+		echo "Touching/Creating " . htmlentities($dbfile) . " &hellip; ";
+
+		if(touch($dbfile) === FALSE) {
+			echo "<span style=\"color:red;\">Failed to touch the database file. Please check the given filename and/or fix the permissions of $dbfile_directory.</span><br />\n";
+			$failed = TRUE;
+		}
+		else
+			echo "done<br />\n";
+
+	}
+
+	if(!$failed) {
+
+		echo "Setting file permissions to 0666 &hellip ";
+
+		if(chmod($dbfile, 0666) === FALSE) {
+			echo "<span style=\"color:red;\">Failed to change the permissions of $dbfile_directory/$dbfile. Please adjust them manually.</span><br />\n";
+			$failed = TRUE;
+		}
+		else
+			echo "done<br />\n";
+
+	}
+
+	if(!$failed) {
+
+		echo "Checking if the given file is empty &hellip ";
+
+		if(filesize($dbfile) > 0) {
+			echo "<span style=\"color:red;\">$dbfile_directory/$dbfile is not empty. Can't create a new database. Please delete/empty this file or give another filename.</span><br />\n";
+			$failed = TRUE;
+		}
+		else
+			echo "it is<br />\n";
+
+	}
+
+	if(!$failed) {
+
+		echo "Connecting to $dbfile &hellip; ";
+
+		$db = dba_open($dbfile, "c", $_POST['handler']);
+
+		if($db === FALSE) {
+			echo "<span style=\"color:red;\">Could not connect to the database!</span><br />\n";
+			$failed = TRUE;
+		}
+		else
+			echo "done<br />\n";
+
+	}
+
+	if(!$failed) {
+
+		echo "Storing necessary internal variables &hellip ";
+
+		$internals = array(
+			"bayes*dbversion" => "2",
+			"bayes*texts.ham" => "0",
+			"bayes*texts.spam" => "0"
+		);
+
+		foreach($internals as $key => $value) {
+			if(dba_insert($key, $value, $db) === FALSE) {
+				echo "<span style=\"color:red;\">Failed to insert data!</span><br />\n";
+				$failed = TRUE;
+				break;
+			}
+		}
+
+		if(!$failed)
+			echo "done<br />\n";
+
+	}
+
+	if(!$failed) {
+
+		echo "Trying to read data from the database &hellip ";
+
+		$dbversion = dba_fetch("bayes*dbversion", $db);
+
+		if($dbversion != "2") {
+			echo "<span style=\"color:red;\">Failed to read data!</span><br />\n";
+			$failed = TRUE;
+		}
+		else
+			echo "success<br />\n";
+	}
+
+	if(!$failed) {
+
+		dba_close($db);
+
+		echo "</p>\n\n";
+		echo "<p style=\"color:green;\">Successfully created a new b8 database!</p>\n\n";
+		echo "<table>\n";
+		echo "<tr><td>Filename:</td><td>$dbfile_directory/$dbfile</td></tr>\n";
+		echo "<tr><td>DBA handler:</td><td>{$_POST['handler']}</td><tr>\n";
+		echo "</table>\n\n";
+		echo "<p>Move this file to it's destination directory (default: the base directory of b8) to use it with b8. Be sure to use the right DBA handler in b8's configuration.";
+
+	}
+
+	echo "</p>\n\n";
+
+}
+
+if($failed === TRUE or !isset($_POST['handler'])) {
+
+echo <<<END
+<form action="{$_SERVER['PHP_SELF']}" method="post">
+
+<h2>DBA Handler</h2>
+
+<p>
+The following table shows all available DBA handlers. Please choose the "Berkeley DB" one.
+</p>
+
+<table>
+<tr><td></td><td><b>Handler</b></td><td><b>Description</b></td></tr>
+
+END;
+
+foreach(dba_handlers(TRUE) as $name => $version) {
+
+	$checked = "";
+
+	if(!isset($_POST['handler'])) {
+		if(strpos($version, "Berkeley") !== FALSE )
+			$checked = " checked=\"checked\"";
+	}
+	else {
+		if($_POST['handler'] == $name)
+			$checked = " checked=\"checked\"";
+	}
+
+	echo "<tr><td><input type=\"radio\" name=\"handler\" value=\"$name\"$checked /></td><td>$name</td><td>$version</td></tr>\n";
+
+}
+
+echo <<<END
+</table>
+
+<h2>Database file</h2>
+
+<p>
+Please the name of the desired database file. It will be created in the directory where this script is located.
+</p>
+
+<p>
+<input type="text" name="dbfile" value="wordlist.db" />
+</p>
+
+<p>
+<input type="submit" value="Create the database" />
+</p>
+
+</form>
+
+
+END;
+
+}
+
+?>
+
+</div>
+
+</body>
+
+</html>

library/spam/install/setup_mysql.sql

@@ -0,0 +1,27 @@
+
+--   Copyright (C) 2010 Tobias Leupold <tobias.leupold@web.de>
+--
+--   This file is part of the b8 package
+--
+--   This program is free software; you can redistribute it and/or modify it
+--   under the terms of the GNU Lesser General Public License as published by
+--   the Free Software Foundation in version 2.1 of the License.
+--
+--   This program is distributed in the hope that it will be useful, but
+--   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+--   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+--   License for more details.
+--
+--   You should have received a copy of the GNU Lesser General Public License
+--   along with this program; if not, write to the Free Software Foundation,
+--   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+CREATE TABLE `b8_wordlist` (
+  `token` varchar(255) character set utf8 collate utf8_bin NOT NULL,
+  `count` varchar(255) default NULL,
+  PRIMARY KEY  (`token`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `b8_wordlist` VALUES ('bayes*dbversion', '2');
+INSERT INTO `b8_wordlist` VALUES ('bayes*texts.ham', '0');
+INSERT INTO `b8_wordlist` VALUES ('bayes*texts.spam', '0');

library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js

@@ -105,6 +105,7 @@
 			rep(/<u>/gi,"[u]");
 			rep(/<blockquote[^>]*>/gi,"[quote]");
 			rep(/<\/blockquote>/gi,"[/quote]");
+			rep(/<hr \/>/gi,"[hr]");
 			rep(/<br \/>/gi,"\n\n");
 			rep(/<br\/>/gi,"\n\n");
 			rep(/<br>/gi,"\n");
@@ -135,6 +136,7 @@
 			rep(/\[\/i\]/gi,"</em>");
 			rep(/\[u\]/gi,"<u>");
 			rep(/\[\/u\]/gi,"</u>");
+			rep(/\[hr\]/gi,"<hr />");
 			rep(/\[bookmark=([^\]]+)\](.*?)\[\/bookmark\]/gi,"<a class=\"bookmark\" href=\"$1\">$2</a>");
 			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
 			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");

mod/admin.php

@@ -10,6 +10,10 @@ function admin_post(&$a){
 		return;
 	}
 
+
+	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+		return;
+	
 	// urls
 	if ($a->argc > 1){
 		switch ($a->argv[1]){
@@ -50,6 +54,9 @@ function admin_content(&$a) {
 		return login(false);
 	}
 
+	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+		return;
+
 	/**
 	 * Side bar links
 	 */
@@ -628,13 +635,25 @@ function admin_page_logs(&$a){
 	$t = get_markup_template("admin_logs.tpl");
 
 	$f = get_config('system','logfile');
-	$size = filesize($f);
-	if($size > 5000000 || $size < 0)
-		$size = 5000000;
 
 	$data = '';
+
+	if(!file_exists($f)) {
+		$data = t("Error trying to open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f exist and is 
+readable.");
+	}
+	else {
 		$fp = fopen($f, 'r');
-	if($fp) {
+		if(!$fp) {
+			$data = t("Couldn't open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f is readable.");
+		}
+		else {
+			$fstat = fstat($fp);
+			$size = $fstat['size'];
+			if($size != 0)
+			{
+				if($size > 5000000 || $size < 0)
+					$size = 5000000;
 				$seek = fseek($fp,0-$size,SEEK_END);
 				if($seek === 0) {
 					fgets($fp); // throw away the first partial line
@@ -642,9 +661,10 @@ function admin_page_logs(&$a){
 					while(! feof($fp))
 						$data .= escape_tags(fread($fp,4096));
 				}
+			}
 			fclose($fp);
 		}
-
+	}			
 
 	return replace_macros($t, array(
 		'$title' => t('Administration'),

mod/community.php

@@ -80,12 +80,10 @@ function community_content(&$a, $update = 0) {
 
 	// we behave the same in message lists as the search module
 
-	$o .= conversation($a,$r,'community',false);
+	$o .= conversation($a,$r,'community',$update);
 
 	$o .= paginate($a);
 
-//	$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
-
 	return $o;
 }
 

mod/contacts.php

@@ -42,6 +42,7 @@ function contacts_init(&$a) {
 
 	$a->page['aside'] .= findpeople_widget();
 
+	$a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
 }
 
 function contacts_post(&$a) {
@@ -99,6 +100,14 @@ function contacts_post(&$a) {
 		info( t('Contact updated.') . EOL);
 	else
 		notice( t('Failed to update contact record.') . EOL);
+
+	$r = q("select * from contact where id = %d and uid = %d limit 1",
+		intval($contact_id),
+		intval(local_user())
+	);
+	if($r && count($r))
+		$a->data['contact'] = $r[0];
+
 	return;
 
 }
@@ -111,7 +120,6 @@ function contacts_content(&$a) {
 	$o = '';
 	nav_set_selected('contacts');
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -211,6 +219,9 @@ function contacts_content(&$a) {
 
 			contact_remove($orig_record[0]['id']);
 			info( t('Contact has been removed.') . EOL );
+			if(x($_SESSION,'return_url'))
+				goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+			else
 				goaway($a->get_baseurl() . '/contacts');
 			return; // NOTREACHED
 		}
@@ -354,32 +365,82 @@ function contacts_content(&$a) {
 
 	}
 
+	$blocked = false;
+	$hidden = false;
+	$ignored = false;
+	$all = false;
 
-	if(($a->argc == 2) && ($a->argv[1] === 'all'))
+	$_SESSION['return_url'] = $a->query_string;
+
+	if(($a->argc == 2) && ($a->argv[1] === 'all')) {
 		$sql_extra = '';
+		$all = true;
+	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
+		$sql_extra = " AND `blocked` = 1 ";
+		$blocked = true;
+	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'hidden')) {
+		$sql_extra = " AND `hidden` = 1 ";
+		$hidden = true;
+	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'ignored')) {
+		$sql_extra = " AND `readonly` = 1 ";
+		$ignored = true;
+	}
 	else
 		$sql_extra = " AND `blocked` = 0 ";
 
 	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+	$nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : '');
 
-	$tpl = get_markup_template("contacts-top.tpl");
-	$o .= replace_macros($tpl,array(
-		'$header' => t('Contacts'),
-		'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
-		'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
-		'$search' => $search,
-		'$desc' => t('Search your contacts'),
-		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
-		'$submit' => t('Find'),
-		'$cmd' => $a->cmd
+	$tabs = array(
+		array(
+			'label' => t('All Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/all', 
+			'sel'   => ($all) ? 'active' : '',
+		),
+		array(
+			'label' => t('Unblocked Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts',
+			'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored)) ? 'active' : '',
+		),
+
+		array(
+			'label' => t('Blocked Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/blocked',
+			'sel'   => ($blocked) ? 'active' : '',
+		),
+
+		array(
+			'label' => t('Ignored Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/ignored',
+			'sel'   => ($ignored) ? 'active' : '',
+		),
+
+		array(
+			'label' => t('Hidden Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/hidden',
+			'sel'   => ($hidden) ? 'active' : '',
+		),
+
+	);
+
+	$tab_tpl = get_markup_template('common_tabs.tpl');
+	$t = replace_macros($tab_tpl, array('$tabs'=>$tabs));
 
 
-	)); 
 
-	if($search)
+
+	if($search) {
+		$search_hdr = $search;
 		$search = dbesc($search.'*');
+	}
 	$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
+	if($nets)
+		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+ 
 	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
 
 	
@@ -389,6 +450,21 @@ function contacts_content(&$a) {
 	if(count($r))
 		$a->set_pager_total($r[0]['total']);
 
+
+	$tpl = get_markup_template("contacts-top.tpl");
+	$o .= replace_macros($tpl,array(
+		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
+		'$tabs' => $t,
+		'$total' => $r[0]['total'],
+		'$search' => $search_hdr,
+		'$desc' => t('Search your contacts'),
+		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
+		'$submit' => t('Find'),
+		'$cmd' => $a->cmd
+
+
+	)); 
+
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),

mod/dfrn_confirm.php

@@ -72,6 +72,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$intro_id  = $handsfree['intro_id'];
 			$duplex    = $handsfree['duplex'];
 			$hidden    = ((array_key_exists('hidden',$handsfree)) ? intval($handsfree['hidden']) : 0 );
+			$activity  = ((array_key_exists('activity',$handsfree)) ? intval($handsfree['activity']) : 0 );
 		}
 		else {
 			$dfrn_id  = ((x($_POST,'dfrn_id'))    ? notags(trim($_POST['dfrn_id'])) : "");
@@ -79,6 +80,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$duplex   = ((x($_POST,'duplex'))     ? intval($_POST['duplex'])        : 0 );
 			$cid      = ((x($_POST,'contact_id')) ? intval($_POST['contact_id'])    : 0 );
 			$hidden   = ((x($_POST,'hidden'))     ? intval($_POST['hidden'])        : 0 );
+			$activity = ((x($_POST,'activity'))   ? intval($_POST['activity'])      : 0 );
 		}
 
 		/**
@@ -370,6 +372,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			if($network === NETWORK_DIASPORA) {
 				if($duplex)
 					$new_relation = CONTACT_IS_FRIEND;
+				else
+					$new_relation = CONTACT_IS_SHARING;
+
 				if($new_relation != CONTACT_IS_FOLLOWER)
 					$writable = 1;
 			}
@@ -425,18 +430,20 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		else
 			$contact = null;
 
+		if(isset($new_relation) && $new_relation == CONTACT_IS_FRIEND) {
+
+			if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
+				require_once('include/diaspora.php');
+				$ret = diaspora_share($user[0],$r[0]);
+				logger('mod_follow: diaspora_share returns: ' . $ret);
+			}
+
 			// Send a new friend post if we are allowed to...
 
 			$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
 				intval($uid)
 			);
-		if((count($r)) && (! $hidden) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) &&  isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) {
-
-			if($r[0]['network'] === NETWORK_DIASPORA) {
-				require_once('include/diaspora.php');
-				$ret = diaspora_share($user[0],$r[0]);
-				logger('mod_follow: diaspora_share returns: ' . $ret);
-			}
+			if((count($r)) && ($activity) && (! $hidden)) {
 
 				require_once('include/items.php');
 
@@ -480,9 +487,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 					$i = item_store($arr);
 					if($i)
 				    	proc_run('php',"include/notifier.php","activity","$i");
-
 				}
-
+			}
 		}
 		// Let's send our user to the contact editor in case they want to
 		// do anything special with this new friend.

mod/dfrn_poll.php

@@ -86,6 +86,7 @@ function dfrn_poll_init(&$a) {
 					$_SESSION['authenticated'] = 1;
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_SESSION['visitor_home'] = $r[0]['url'];
+					$_SESSION['visitor_handle'] = $r[0]['addr'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
 					info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
 					// Visitors get 1 day session.

mod/dfrn_request.php

@@ -577,6 +577,7 @@ function dfrn_request_content(&$a) {
 						'language'     => $r[0]['language'],
 						'to_name'      => $r[0]['username'],
 						'to_email'     => $r[0]['email'],
+						'uid'          => $r[0]['uid'],
 						'link'		   => $a->get_baseurl() . '/notifications/intros',
 						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
 						'source_link'  => $r[0]['url'],

mod/directory.php

@@ -26,6 +26,8 @@ function directory_post(&$a) {
 function directory_content(&$a) {
 
 	$everything = (($a->argc > 1 && $a->argv[1] === 'all' && is_site_admin()) ? true : false);
+	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+		$everything = false;
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);

mod/display.php

@@ -11,6 +11,7 @@ function display_content(&$a) {
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
 	require_once('include/conversation.php');
+	require_once('include/acl_selectors.php');
 
 
 	$o = '<div id="live-display"></div>' . "\r\n";
@@ -67,6 +68,23 @@ function display_content(&$a) {
 		return;
 	}
 	
+	if ($is_owner)
+		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
+		$x = array(
+			'is_owner' => true,
+			'allow_location' => $a->user['allow_location'],
+			'default_location' => $a->user['default_location'],
+			'nickname' => $a->user['nickname'],
+			'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+			'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
+			'bang' => (($group || $cid) ? '!' : ''),
+			'visitor' => 'block',
+			'profile_uid' => local_user()
+		);	
+		$o .= status_editor($a,$x,0,true);
+
+
 	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 

mod/editpost.php

@@ -28,6 +28,10 @@ function editpost_content(&$a) {
 		return;
 	}
 
+	$plaintext = false;
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+		$plaintext = true;
+
 
 	$o .= '<h2>' . t('Edit post') . '</h2>';
 
@@ -35,6 +39,7 @@ function editpost_content(&$a) {
 	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
+		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
@@ -108,11 +113,14 @@ function editpost_content(&$a) {
 		'$emailcc' => t('CC: email addresses'),
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
+		'$title' => $itm[0]['title'],
+		'$placeholdertitle' => t('Set title'),
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $lockstate,
 		'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
 		'$bang' => (($group) ? '!' : ''),
 		'$profile_uid' => $_SESSION['uid'],
+		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
 	));
 

mod/events.php

@@ -1,5 +1,6 @@
 <?php
 
+require_once('include/bbcode.php');
 require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
@@ -110,11 +111,14 @@ function events_content(&$a) {
 		return;
 	}
 
+
+	$htpl = get_markup_template('event_head.tpl');
+	$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
+
 	$o ="";
 	// tabs
-	$o .= profile_tabs($a, True);	
+	$tabs = profile_tabs($a, True);	
 
-	$o .= '<h2>' . t('Events') . '</h2>';
 
 
 	$mode = 'view';
@@ -138,6 +142,8 @@ function events_content(&$a) {
 	}
 
 	if($mode == 'view') {
+		
+		
 	    $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
     	$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
 		if(! $y)
@@ -168,11 +174,16 @@ function events_content(&$a) {
 			$prevyear --;
 		}
 			
-			
 		$dim    = get_dim($y,$m);
 		$start  = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
 		$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
 
+
+		if ($a->argv[1] === 'json'){
+			if (x($_GET,'start'))	$start = date("Y-m-d h:i:s", $_GET['start']);
+			if (x($_GET,'end'))	$finish = date("Y-m-d h:i:s", $_GET['end']);
+		}
+	
 		$start  = datetime_convert('UTC','UTC',$start);
 		$finish = datetime_convert('UTC','UTC',$finish);
 
@@ -180,6 +191,14 @@ function events_content(&$a) {
 		$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
 
+		if (x($_GET,'id')){
+			$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
+				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` 
+				WHERE `event`.`uid` = %d AND `event`.`id` = %d",
+				intval(local_user()),
+				intval($_GET['id'])
+			);
+		} else {
 			$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` 
 				WHERE `event`.`uid` = %d
@@ -191,6 +210,7 @@ function events_content(&$a) {
 				dbesc($adjust_start),
 				dbesc($adjust_finish)
 			);
+		}
 
 		$links = array();
 
@@ -204,17 +224,7 @@ function events_content(&$a) {
 		}
 
 
-		$o .= '<div id="new-event-link"><a href="' . $a->get_baseurl() . '/events/new' . '" >' . t('Create New Event') . '</a></div>';
-		$o .= '<div id="event-calendar-wrapper">';
-
-		$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal"><div id="event-calendar-prev" class="icon prev" title="' . t('Previous') . '"></div></a>';
-		$o .= cal($y,$m,$links, ' eventcal');
-
-		$o .= '<a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal"><div id="event-calendar-next" class="icon next" title="' . t('Next') . '"></div></a>';
-		$o .= '</div>';
-		$o .= '<div class="event-calendar-end"></div>';
-
-
+		$events=array();
 
 		$last_date = '';
 		$fmt = t('l, F j');
@@ -222,25 +232,82 @@ function events_content(&$a) {
 		if(count($r)) {
 			$r = sort_by_date($r);
 			foreach($r as $rr) {
+				
+				
 				$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
 				$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt));
 				$d = day_translate($d);
-				if($d !== $last_date)
-					$o .= '<hr /><a name="link-' . $j . '" ><div class="event-list-date">' . $d . '</div></a>';
+				
+				$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'c') : datetime_convert('UTC','UTC',$rr['start'],'c'));
+				if ($rr['nofinish']){
+					$end = null;
+				} else {
+					$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['finish'], 'c') : datetime_convert('UTC','UTC',$rr['finish'],'c'));
+				}
+				
+				
+				$is_first = ($d !== $last_date);
+					
 				$last_date = $d;
-				if($rr['author-name']) {
-					$o .= '<a href="' . $rr['author-link'] . '" ><img src="' . $rr['author-avatar'] . '" height="32" width="32" />' . $rr['author-name'] . '</a>';
-				}
-				$o .= format_event_html($rr);
-				$o .= ((! $rr['cid']) ? '<a href="' . $a->get_baseurl() . '/events/event/' . $rr['id'] . '" title="' . t('Edit event') . '" class="edit-event-link icon pencil"></a>' : '');
-				if($rr['plink'])
-					$o .= '<a href="' . $rr['plink'] . '" title="' . t('link to source') . '" target="external-link" class="plink-event-link icon remote-link"></a></div>';
+				$edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
+
+				list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
+				$title = strip_tags($title);
+				$html = format_event_html($rr);
+				$rr['desc'] = bbcode($rr['desc']);
+				$rr['location'] = bbcode($rr['location']);
+				$events[] = array(
+					'id'=>$rr['id'],
+					'start'=> $start,
+					'end' => $end,
+					'allDay' => false,
+					'title' => $title,
+					
+					'j' => $j,
+					'd' => $d,
+					'edit' => $edit,
+					'is_first'=>$is_first,
+					'item'=>$rr,
+					'html'=>$html,
+					'plink' => array($rr['plink'],t('link to source'),'',''),
+				);
 
-				$o .= '<div class="clear"></div>';
 
 			}
 		}
+		 
+		if ($a->argv[1] === 'json'){
+			echo json_encode($events); killme();
+		}
+		
+		// links: array('href', 'text', 'extra css classes', 'title')
+		if (x($_GET,'id')){
+			$tpl =  get_markup_template("event.tpl");
+		} else {
+			if (get_config('experimentals','new_calendar')==1){
+				$tpl = get_markup_template("events-js.tpl");
+			} else {
+				$tpl = get_markup_template("events.tpl");
+			}
+		}
+		$o = replace_macros($tpl, array(
+			'$baseurl'	=> $a->get_baseurl(),
+			'$tabs'		=> $tabs,
+			'$title'	=> t('Events'),
+			'$new_event'=> array($a->get_baseurl().'/events/new',t('Create New Event'),'',''),
+			'$previus'	=> array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
+			'$next'		=> array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
+			'$calendar' => cal($y,$m,$links, ' eventcal'),
+			
+			'$events'	=> $events,
+			
+			
+		));
+		
+		if (x($_GET,'id')){ echo $o; killme(); }
+		
 		return $o;
+		
 	}
 
 	if($mode === 'edit' && $event_id) {
@@ -271,8 +338,7 @@ function events_content(&$a) {
 		if($cid)
 			$sh_checked .= ' disabled="disabled" ';
 
-		$htpl = get_markup_template('event_head.tpl');
-		$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
+
 
 		$tpl = get_markup_template('event_form.tpl');
 
@@ -311,8 +377,9 @@ function events_content(&$a) {
 			'$eid' => $eid, 
 			'$cid' => $cid,
 			'$uri' => $uri,
-			'$e_text' => t('Event details'),
-			'$e_desc' => sprintf( t('Format is %s %s. Starting date and Description are required.'),$dateformat,$timeformat),
+			'$title' => t('Event details'),
+			'$desc' => sprintf( t('Format is %s %s. Starting date and Description are required.'),$dateformat,$timeformat),
+			
 			'$s_text' => t('Event Starts:') . ' <span class="required">*</span> ',
 			'$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday),
 			'$s_tsel' => timesel('start',$shour,$sminute),

mod/install.php

@@ -186,8 +186,8 @@ function install_content(&$a) {
 
 			check_keys($checks);
 			
-			if(x($_POST,'phppath'))
-				$phpath = notags(trim($_POST['phppath']));
+			if(x($_POST,'phpath'))
+				$phpath = notags(trim($_POST['phpath']));
 
 			check_php($phpath, $checks);
 
@@ -210,6 +210,7 @@ function install_content(&$a) {
 				'$next' => t('Next'),
 				'$reload' => t('Check again'),
 				'$phpath' => $phpath,
+				'$baseurl' => $a->get_baseurl(),
 			));
 			return $o;
 		}; break;
@@ -220,7 +221,7 @@ function install_content(&$a) {
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
 			$dbdata = notags(trim($_POST['dbdata']));
-			$phpath = notags(trim($_POST['phppath']));
+			$phpath = notags(trim($_POST['phpath']));
 			
 
 			$tpl = get_markup_template('install_db.tpl');
@@ -258,7 +259,7 @@ function install_content(&$a) {
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
 			$dbdata = notags(trim($_POST['dbdata']));
-			$phpath = notags(trim($_POST['phppath']));
+			$phpath = notags(trim($_POST['phpath']));
 			
 			$adminmail = notags(trim($_POST['adminmail']));
 			$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
@@ -322,7 +323,7 @@ function check_php(&$phpath, &$checks) {
 		$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
 		$tpl = get_markup_template('field_input.tpl');
 		$help .= replace_macros($tpl, array(
-			'$field' => array('phppath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
+			'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
 		));
 		$phpath="";
 	}

mod/item.php

@@ -4,7 +4,7 @@
  *
  * This is the POST destination for most all locally posted
  * text stuff. This function handles status, wall-to-wall status, 
- * local comments, and remote coments - that are posted on this site 
+ * local comments, and remote coments that are posted on this site 
  * (as opposed to being delivered in a feed).
  * Also processed here are posts and comments coming through the 
  * statusnet/twitter API. 
@@ -17,6 +17,7 @@
 
 require_once('include/crypto.php');
 require_once('include/enotify.php');
+require_once('include/email.php');
 
 function item_post(&$a) {
 
@@ -42,6 +43,7 @@ function item_post(&$a) {
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+	$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
 
 	/**
 	 * Is this a reply to something?
@@ -56,8 +58,6 @@ function item_post(&$a) {
 	$parid = 0;
 	$r = false;
 
-	$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
-
 	if($parent || $parent_uri) {
 
 		if(! x($_REQUEST,'type'))
@@ -110,8 +110,6 @@ function item_post(&$a) {
 
 	if($parent) logger('mod_post: parent=' . $parent);
 
-
-
 	$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
 	$post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
 	$app         = ((x($_REQUEST,'source'))      ? strip_tags($_REQUEST['source'])  : '');
@@ -606,6 +604,7 @@ function item_post(&$a) {
 	$datarray['thr-parent']    = $thr_parent;
 	$datarray['postopts']      = '';
 	$datarray['origin']        = $origin;
+	$datarray['moderated']     = $allow_moderated;
 
 	/**
 	 * These fields are for the convenience of plugins...
@@ -635,9 +634,24 @@ function item_post(&$a) {
 
 	call_hooks('post_local',$datarray);
 
+	if(x($datarray,'cancel')) {
+		logger('mod_item: post cancelled by plugin.');
+		if($return_path) {
+			goaway($a->get_baseurl() . "/" . $return_path);
+		}
+
+		$json = array('cancel' => 1);
+		if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
+			$json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
+
+		echo json_encode($json);
+		killme();
+	}
+
 
 	if($orig_post) {
-		$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			dbesc($title),
 			dbesc($body),
 			dbesc(datetime_convert()),
 			intval($post_id),
@@ -657,8 +671,8 @@ function item_post(&$a) {
 
 	$r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
-		`tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin` )
-		VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d )",
+		`tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated` )
+		VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d )",
 		dbesc($datarray['guid']),
 		intval($datarray['uid']),
 		dbesc($datarray['type']),
@@ -695,7 +709,8 @@ function item_post(&$a) {
 		intval($datarray['pubmail']),
 		dbesc($datarray['attach']),
 		intval($datarray['bookmark']),
-		intval($datarray['origin'])
+		intval($datarray['origin']),
+		intval($datarry['moderated'])
 	);
 
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
@@ -731,6 +746,7 @@ function item_post(&$a) {
 					'language'     => $user['language'],
 					'to_name'      => $user['username'],
 					'to_email'     => $user['email'],
+					'uid'          => $user['uid'],
 					'item'         => $datarray,
 					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 					'source_name'  => $datarray['author-name'],
@@ -773,6 +789,7 @@ function item_post(&$a) {
 					'language'     => $user['language'],
 					'to_name'      => $user['username'],
 					'to_email'     => $user['email'],
+					'uid'          => $user['uid'],
 					'item'         => $datarray,
 					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 					'source_name'  => $datarray['author-name'],
@@ -840,8 +857,8 @@ function item_post(&$a) {
 				$disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
 				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; 
 
-				$subject  = '[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']);
-				$headers  = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n";
+				$subject  = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
+				$headers  = 'From: ' . email_header_encode($a->user['username'],'UTF-8') . ' <' . $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";

mod/network.php

@@ -56,7 +56,9 @@ function saved_searches($search) {
 		. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
 		. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
 		. ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '')
-		. ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '');
+		. ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '')
+		. ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '')
+		. ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : '');
 	
 	$o = '';
 
@@ -113,6 +115,7 @@ function network_content(&$a, $update = 0) {
 	$all_active = '';
 	$search_active = '';
 	$conv_active = '';
+	$spam_active = '';
 
 	if(($a->argc > 1 && $a->argv[1] === 'new') 
 		|| ($a->argc > 2 && $a->argv[2] === 'new')) {
@@ -135,12 +138,17 @@ function network_content(&$a, $update = 0) {
 		$conv_active = 'active';
 	}
 
+	if($_GET['spam']) {
+		$spam_active = 'active';
+	}
+
 	
 	if (($new_active == '') 
 		&& ($starred_active == '') 
 		&& ($bookmarked_active == '')
 		&& ($conv_active == '')
-		&& ($search_active == '')) {
+		&& ($search_active == '')
+		&& ($spam_active == '')) {
 			$all_active = 'active';
 	}
 
@@ -152,8 +160,6 @@ function network_content(&$a, $update = 0) {
 		$postord_active = 'active';
 	}
 			 	
-
-	
 	// tabs
 	$tabs = array(
 		array(
@@ -187,6 +193,13 @@ function network_content(&$a, $update = 0) {
 			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
 			'sel'=>$bookmarked_active,
 		),	
+//		array(
+//			'label' => t('Spam'),
+//			'url'=>$a->get_baseurl() . '/network?f=&spam=1'
+//			'sel'=> $spam_active,
+//		),	
+
+
 	);
 	$tpl = get_markup_template('common_tabs.tpl');
 	$o .= replace_macros($tpl, array('$tabs'=>$tabs));
@@ -209,7 +222,10 @@ function network_content(&$a, $update = 0) {
 	$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
 	$liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
 	$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
+	$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
 	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
+	$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
+	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
 
 	if(($a->argc > 2) && $a->argv[2] === 'new')
 		$nouveau = true;
@@ -271,11 +287,7 @@ function network_content(&$a, $update = 0) {
 
 	$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : '');
 
-	// We'll need the following line if starred/bookmarks are allowed in comments in the future
-	//	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
-
-	// Otherwise, this is a bit faster:
-	$sql_extra = $sql_options;
+	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
 
 	if($group) {
 		$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -344,7 +356,11 @@ function network_content(&$a, $update = 0) {
 			. ((x($_GET,'bmark'))  ? '&bmark='  . $_GET['bmark']  : '') 
 			. ((x($_GET,'liked'))  ? '&liked='  . $_GET['liked']  : '') 
 			. ((x($_GET,'conv'))   ? '&conv='   . $_GET['conv']   : '') 
+			. ((x($_GET,'spam'))   ? '&spam='   . $_GET['spam']   : '') 
 			. ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
+			. ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
+			. ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
+
 			. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
 

mod/newmember.php

@@ -9,35 +9,39 @@ function newmember_content(&$a) {
 
 	$o .= '<div style="font-size: 120%;">';
 
-	$o .= t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page.');
+	$o .= t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.');
 
 	$o .= '<ul>';
 
-	$o .= '<li>' . '<a href="settings">' . t('On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This will be useful in making friends.') . '</a></li>' . EOL; 
+	$o .= '<li>' . '<a target="newmember" href="settings">' . t('On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</a></li>' . EOL; 
 
-	$o .= '<li>' . '<a href="settings">' . t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '</a></li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="settings">' . t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '</a></li>' . EOL;
 
-	$o .= '<li>' . '<a href="profile_photo">' . t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.') . '</a></li>' . EOL;  
+	$o .= '<li>' . '<a target="newmember" href="profile_photo">' . t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.') . '</a></li>' . EOL;  
 
 	if(in_array('facebook', $a->plugins))
-		$o .= '<li>' . '<a href="facebook">' . t("Authorise the Facebook Connector if you currently have a Facebook account and we will \x28optionally\x29 import all your Facebook friends and conversations.") . '</a></li>' . EOL;
+		$o .= '<li>' . '<a target="newmember" href="facebook">' . t("Authorise the Facebook Connector if you currently have a Facebook account and we will \x28optionally\x29 import all your Facebook friends and conversations.") . '</a></li>' . EOL;
+	else
+		$o .= '<li>' . '<a target="newmember" href="help/Installing-Connectors">' . t("<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web.") . '</a></li>' . EOL;
 
     $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
 	
 	if(! $mail_disabled)
-		$o .= '<li>' . '<a href="settings/connectors">' .  t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</a></li>' . EOL;
+		$o .= '<li>' . '<a target="newmember" href="settings/connectors">' .  t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</a></li>' . EOL;
 
-	$o .= '<li>' . '<a href="profiles">' . t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</a></li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="profiles">' . t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</a></li>' . EOL;
 
-	$o .= '<li>' . '<a href="profiles">' . t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.') . '</a></li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="profiles">' . t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.') . '</a></li>' . EOL;
 
-	$o .= '<li>' . '<a href="contacts">' . t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog.') . '</a></li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="contacts">' . t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog.') . '</a></li>' . EOL;
 
-	$o .= '<li>' . '<a href="directory">' . t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.') . '</a></li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="directory">' . t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.') . '</a></li>' . EOL;
 
-	$o .= '<li>' . '<a href="contacts">' . t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.') . '</a></li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="contacts">' . t("On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.") . '</a></li>' . EOL;
 
-	$o .= '<li>' . '<a href="help">' . t('Our <strong>help</strong> pages may be consulted for detail on other program features and resources.') . '</a></li>' . EOL;
+	$o .= '<li>' . '<a target="newmember" href="contacts">' . t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.') . '</a></li>' . EOL;
+
+	$o .= '<li>' . '<a target="newmember" href="help">' . t('Our <strong>help</strong> pages may be consulted for detail on other program features and resources.') . '</a></li>' . EOL;
 
 	$o .= '</div>';
 

mod/notifications.php

@@ -142,6 +142,8 @@ function notifications_content(&$a) {
 						'$fullname' => $rr['fname'],
 						'$url' => $rr['furl'],
 						'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
+						'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
+
 						'$knowyou' => $knowyou,
 						'$approve' => t('Approve'),
 						'$note' => $rr['note'],
@@ -187,6 +189,7 @@ function notifications_content(&$a) {
 					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
 					'$fullname' => $rr['name'],
 					'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
+					'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
 					'$url' => $rr['url'],
 					'$knowyou' => $knowyou,
 					'$approve' => t('Approve'),

mod/oembed.php

@@ -2,11 +2,26 @@
 require_once("include/oembed.php");
 
 function oembed_content(&$a){
+	// logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
+
+	if ($a->argv[1]=='b2h'){
+		$url = array( "", trim(hex2bin($_REQUEST['url'])));
+		echo oembed_replacecb($url);
+		killme();
+	}
+	
+	if ($a->argv[1]=='h2b'){
+		$text = trim(hex2bin($_REQUEST['text']));
+		echo oembed_html2bbcode($text);
+		killme();
+	}
+	
 	if ($a->argc == 2){
 		echo "<html><body>";
 		$url = base64url_decode($a->argv[1]);
 		$j = oembed_fetch_url($url);
 		echo $j->html;
+//		logger('mod-oembed ' . $j->html, LOGGER_ALL);
 		echo "</body></html>";
 	}
 	killme();

mod/oexchange.php

@@ -12,8 +12,6 @@ function oexchange_init(&$a) {
 	}
 
 
-
-
 }
 
 function oexchange_content(&$a) {
@@ -28,14 +26,14 @@ function oexchange_content(&$a) {
 		return;
 	}
 
-	$url = (((x($_GET,'url')) && strlen($_GET['url'])) 
-		? urlencode(notags(trim($_GET['url']))) : '');
-	$title = (((x($_GET,'title')) && strlen($_GET['title'])) 
-		? '&title=' . urlencode(notags(trim($_GET['title']))) : '');
-	$description = (((x($_GET,'description')) && strlen($_GET['description'])) 
-		? '&description=' . urlencode(notags(trim($_GET['description']))) : '');
-	$tags = (((x($_GET,'tags')) && strlen($_GET['tags'])) 
-		? '&tags=' . urlencode(notags(trim($_GET['tags']))) : '');
+	$url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url'])) 
+		? urlencode(notags(trim($_REQUEST['url']))) : '');
+	$title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title'])) 
+		? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
+	$description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description'])) 
+		? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
+	$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags'])) 
+		? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
 
 	$s = fetch_url($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
 
@@ -51,7 +49,7 @@ function oexchange_content(&$a) {
 	$post['body'] = html2bbcode($s);
 	$post['type'] = 'wall';
 
-	$_POST = $post;
+	$_REQUEST = $post;
 	require_once('mod/item.php');
 	item_post($a);
 

mod/parse_url.php

@@ -12,6 +12,13 @@ function parse_url_content(&$a) {
 	$text = null;
 	$str_tags = '';
 
+	$textmode = false;
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+		$textmode = true;
+
+	if($textmode)
+	$br = (($textmode) ? "\n" : '<br /?');
+
 	if(x($_GET,'binurl'))
 		$url = trim(hex2bin($_GET['binurl']));
 	else
@@ -27,13 +34,16 @@ function parse_url_content(&$a) {
 		$arr_tags = str_getcsv($_GET['tags']);
 		if(count($arr_tags)) {
 			array_walk($arr_tags,'arr_add_hashes');
-			$str_tags = '<br />' . implode(' ',$arr_tags) . '<br />'; 		
+			$str_tags = $br . implode(' ',$arr_tags) . $br;
 		}
 	}
 
 	logger('parse_url: ' . $url);
 
 
+	if($textmode)
+		$template = $br . '[bookmark=%s]%s[/bookmark]%s' . $br;
+	else
 		$template = "<br /><a class=\"bookmark\" href=\"%s\" >%s</a>%s<br />";
 
 
@@ -49,7 +59,11 @@ function parse_url_content(&$a) {
 
 	if($url && $title && $text) {
 
+		if($textmode)
+			$text = $br . $br . '[quote]' . $text . '[/quote]' . $br;
+		else
 			$text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
+
 		$title = str_replace(array("\r","\n"),array('',''),$title);
 
 		$result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags;
@@ -208,11 +222,18 @@ function parse_url_content(&$a) {
 								$ph->scaleImage(300);
 								$new_width = $ph->getWidth();
 								$new_height = $ph->getHeight();
+								if($textmode)
+									$image = $br . $br . '[img=' . $new_width . 'x' . $new_height . ']' . $image . '[/img]';
+								else
 									$image = '<br /><br /><img height="' . $new_height . '" width="' . $new_width . '" src="' .$image . '" alt="photo" />';
 							}
+							else {
+								if($textmode) 
+									$image = $br . $br . '[img]' . $image . '[/img]';
 								else
 									$image = '<br /><br /><img src="' . $image . '" alt="photo" />';
 							}
+						}
 						else
 							$image = '';
 					
@@ -223,11 +244,14 @@ function parse_url_content(&$a) {
 	}
 
 	if(strlen($text)) {
+		if($textmode)
+			$text = $br .$br . '[quote]' . $text . '[/quote]' . $br ;
+		else
 			$text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
 	}
 
 	if($image) {
-		$text = $image . '<br />' . $text;
+		$text = $image . $br . $text;
 	}
 	$title = str_replace(array("\r","\n"),array('',''),$title);
 

mod/profile.php

@@ -128,7 +128,7 @@ function profile_content(&$a, $update = 0) {
 		}
 
 		if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
-			$o .= '<a href="newmember">' . t('Tips for New Members') . '</a>' . EOL;
+			$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL;
 
 		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
 		$commvisitor = (($commpage && $remote_contact == true) ? true : false);

mod/redir.php

@@ -2,17 +2,20 @@
 
 function redir_init(&$a) {
 
-	if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
-		goaway(z_root());
-	$cid = $a->argv[1];
 	$url = ((x($_GET,'url')) ? $_GET['url'] : '');
 
+	// traditional DFRN
+
+	if(local_user() && $a->argc == 2 && intval($a->argv[1])) {
+
+		$cid = $a->argv[1];
+
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($cid),
 			intval(local_user())
 		);
 
-	if((! count($r)) || ($r[0]['network'] !== 'dfrn'))
+		if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
 			goaway(z_root());
 
 		$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
@@ -41,5 +44,17 @@ function redir_init(&$a) {
 		$dest = (($url) ? '&destination_url=' . $url : '');
 		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
 			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
-	
+	}
+
+	if(local_user())
+		$handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
+	if(remote_user())
+		$handle = $_SESSION['handle'];
+
+	if($url) {
+		$url = str_replace('{zid}','&zid=' . $handle,$url);
+		goaway($url);
+	}
+
+	goaway(z_root());
 }