add standard directories

Added some of the standard directories

darcs-hash:20080506151729-84dde-563da8505e06a7302041c93ab157ced31165876c.gz

29 files changed, 7453 insertions, 0 deletions

diff --git a/_darcs/pristine/lib/Shorturl_api.php b/_darcs/pristine/lib/Shorturl_api.php
new file mode 100644
index 000000000..7beae0ec6
--- /dev/null
+++ b/_darcs/pristine/lib/Shorturl_api.php
@@ -0,0 +1,121 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class ShortUrlApi {
+    protected $service_url;
+
+    function __construct($service_url) {
+        $this->service_url = $service_url;
+    }
+
+    function shorten($url) {
+        if ($this->is_long($url)) return $this->shorten_imp($url);
+        return $url;
+    }
+
+    protected function shorten_imp($url) {
+        return "To Override";
+    }
+
+    private function is_long($url) {
+        return strlen($url) >= 30;
+    }
+
+    protected function http_post($data) {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $this->service_url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        $response = curl_exec($ch);
+        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+        if (($code < 200) || ($code >= 400)) return false;
+        return $response;
+    }
+
+    protected function http_get($url) {
+        $encoded_url = urlencode($url);
+        return file_get_contents("{$this->service_url}$encoded_url");
+    }
+
+    protected function tidy($response) {
+        $response = str_replace('&nbsp;', ' ', $response);
+        $config = array('output-xhtml' => true);
+        $tidy = new tidy;
+        $tidy->parseString($response, $config, 'utf8');
+        $tidy->cleanRepair();
+        return (string)$tidy;
+    }
+}
+
+class LilUrl extends ShortUrlApi {
+    function __construct() {
+        parent::__construct('http://ur1.ca/');
+    }
+
+    protected function shorten_imp($url) {
+        $data['longurl'] = $url;
+        $response = $this->http_post($data);
+        if (!$response) return $url;
+        $y = @simplexml_load_string($response);
+        if (!isset($y->body)) return $url;
+        $x = $y->body->p[0]->a->attributes();
+        if (isset($x['href'])) return $x['href'];
+        return $url;
+    }
+}
+
+
+class PtitUrl extends ShortUrlApi {
+    function __construct() {
+        parent::__construct('http://ptiturl.com/?creer=oui&action=Reduire&url=');
+    }
+
+    protected function shorten_imp($url) {
+        $response = $this->http_get($url);
+        if (!$response) return $url;
+        $response = $this->tidy($response);
+        $y = @simplexml_load_string($response);
+        if (!isset($y->body)) return $url;
+        $xml = $y->body->center->table->tr->td->pre->a->attributes();
+        if (isset($xml['href'])) return $xml['href'];
+        return $url;
+    }
+}
+
+class TightUrl extends ShortUrlApi {
+    function __construct() {
+        parent::__construct('http://2tu.us/?save=y&url=');
+    }
+
+    protected function shorten_imp($url) {
+        $response = $this->http_get($url);
+        if (!$response) return $url;
+        $response = $this->tidy($response);
+        $y = @simplexml_load_string($response);
+        if (!isset($y->body)) return $url;
+        $xml = $y->body->p[0]->code[0]->a->attributes();
+        if (isset($xml['href'])) return $xml['href'];
+        return $url;
+    }
+}
+
diff --git a/_darcs/pristine/lib/action.php b/_darcs/pristine/lib/action.php
new file mode 100644
index 000000000..7a2461bb5
--- /dev/null
+++ b/_darcs/pristine/lib/action.php
@@ -0,0 +1,142 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class Action { // lawsuit
+
+	var $args;
+
+	function Action() {
+	}
+
+	# For initializing members of the class
+
+	function prepare($argarray) {
+		$this->args =& common_copy_args($argarray);
+		return true;
+	}
+
+	# For comparison with If-Last-Modified
+	# If not applicable, return NULL
+
+	function last_modified() {
+		return NULL;
+	}
+
+	function etag() {
+		return NULL;
+	}
+
+	function is_readonly() {
+		return false;
+	}
+
+	function arg($key, $def=NULL) {
+		if (array_key_exists($key, $this->args)) {
+			return $this->args[$key];
+		} else {
+			return $def;
+		}
+	}
+
+	function trimmed($key, $def=NULL) {
+		$arg = $this->arg($key, $def);
+		return (is_string($arg)) ? trim($arg) : $arg;
+	}
+
+	# Note: argarray ignored, since it's now passed in in prepare()
+
+	function handle($argarray=NULL) {
+
+		$lm = $this->last_modified();
+		$etag = $this->etag();
+
+		if ($etag) {
+			header('ETag: ' . $etag);
+		}
+
+		if ($lm) {
+			header('Last-Modified: ' . date(DATE_RFC1123, $lm));
+			$if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
+			if ($if_modified_since) {
+				$ims = strtotime($if_modified_since);
+				if ($lm <= $ims) {
+					if (!$etag || $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
+						header('HTTP/1.1 304 Not Modified');
+						# Better way to do this?
+						exit(0);
+					}
+				}
+			}
+		}
+	}
+
+	function _has_etag($etag, $if_none_match) {
+		return ($if_none_match) && in_array($etag, explode(',', $if_none_match));
+	}
+
+	function boolean($key, $def=false) {
+		$arg = strtolower($this->trimmed($key));
+
+		if (is_null($arg)) {
+			return $def;
+		} else if (in_array($arg, array('true', 'yes', '1'))) {
+			return true;
+		} else if (in_array($arg, array('false', 'no', '0'))) {
+			return false;
+		} else {
+			return $def;
+		}
+	}
+
+	function server_error($msg, $code=500) {
+		$action = $this->trimmed('action');
+		common_debug("Server error '$code' on '$action': $msg", __FILE__);
+		common_server_error($msg, $code);
+	}
+
+	function client_error($msg, $code=400) {
+		$action = $this->trimmed('action');
+		common_debug("User error '$code' on '$action': $msg", __FILE__);
+		common_user_error($msg, $code);
+	}
+
+	function self_url() {
+		$action = $this->trimmed('action');
+		$args = $this->args;
+		unset($args['action']);
+		foreach (array_keys($_COOKIE) as $cookie) {
+			unset($args[$cookie]);
+		}
+		return common_local_url($action, $args);
+	}
+
+	function nav_menu($menu) {
+        $action = $this->trimmed('action');
+        common_element_start('ul', array('id' => 'nav_views'));
+        foreach ($menu as $menuaction => $menudesc) {
+            common_menu_item(common_local_url($menuaction, isset($menudesc[2]) ? $menudesc[2] : NULL),
+							 $menudesc[0],
+							 $menudesc[1],
+							 $action == $menuaction);
+        }
+        common_element_end('ul');
+	}
+}
diff --git a/_darcs/pristine/lib/common.php b/_darcs/pristine/lib/common.php
new file mode 100644
index 000000000..5a28c3091
--- /dev/null
+++ b/_darcs/pristine/lib/common.php
@@ -0,0 +1,172 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+define('LACONICA_VERSION', '0.6.4.1');
+
+define('AVATAR_PROFILE_SIZE', 96);
+define('AVATAR_STREAM_SIZE', 48);
+define('AVATAR_MINI_SIZE', 24);
+define('MAX_AVATAR_SIZE', 256 * 1024);
+
+define('NOTICES_PER_PAGE', 20);
+define('PROFILES_PER_PAGE', 20);
+
+define('FOREIGN_NOTICE_SEND', 1);
+define('FOREIGN_NOTICE_RECV', 2);
+define('FOREIGN_NOTICE_SEND_REPLY', 4);
+
+define('FOREIGN_FRIEND_SEND', 1);
+define('FOREIGN_FRIEND_RECV', 2);
+
+define_syslog_variables();
+
+# append our extlib dir as the last-resort place to find libs
+
+set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
+
+# global configuration object
+
+require_once('PEAR.php');
+require_once('DB/DataObject.php');
+require_once('DB/DataObject/Cast.php'); # for dates
+
+require_once(INSTALLDIR.'/lib/language.php');
+
+// default configuration, overwritten in config.php
+
+$config =
+  array('site' =>
+		array('name' => 'Just another Laconica microblog',
+			  'server' => 'localhost',
+			  'theme' => 'default',
+			  'path' => '/',
+			  'logfile' => NULL,
+			  'fancy' => false,
+			  'locale_path' => INSTALLDIR.'/locale',
+			  'language' => 'en_US',
+			  'languages' => get_all_languages(),
+		      'email' =>
+		      array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
+			  'broughtby' => NULL,
+			  'timezone' => 'UTC',
+			  'broughtbyurl' => NULL,
+			  'closed' => false,
+			  'inviteonly' => false,
+              'private' => false),
+		'syslog' =>
+		array('appname' => 'laconica', # for syslog
+			  'priority' => 'debug'), # XXX: currently ignored
+		'queue' =>
+		array('enabled' => false),
+		'license' =>
+		array('url' => 'http://creativecommons.org/licenses/by/3.0/',
+			  'title' => 'Creative Commons Attribution 3.0',
+			  'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'),
+		'mail' =>
+		array('backend' => 'mail',
+			  'params' => NULL),
+		'nickname' =>
+		array('blacklist' => array(),
+			  'featured' => array()),
+		'profile' =>
+		array('banned' => array()),
+		'avatar' =>
+		array('server' => NULL),
+		'public' =>
+		array('localonly' => true,
+			  'blacklist' => array()),
+		'theme' =>
+		array('server' => NULL),
+		'throttle' =>
+        array('enabled' => false, // whether to throttle edits; false by default
+              'count' => 20, // number of allowed messages in timespan
+              'timespan' => 600), // timespan for throttling
+		'xmpp' =>
+		array('enabled' => false,
+			  'server' => 'INVALID SERVER',
+			  'port' => 5222,
+			  'user' => 'update',
+			  'encryption' => true,
+			  'resource' => 'uniquename',
+			  'password' => 'blahblahblah',
+			  'host' => NULL, # only set if != server
+			  'debug' => false, # print extra debug info
+			  'public' => array()), # JIDs of users who want to receive the public stream
+        'sphinx' =>
+        array('enabled' => false,
+              'server' => 'localhost',
+              'port' => 3312),
+		'tag' =>
+		array('dropoff' => 864000.0),
+		'popular' =>
+		array('dropoff' => 864000.0),
+		'daemon' =>
+		array('piddir' => '/var/run',
+			  'user' => false,
+			  'group' => false),
+		'integration' =>
+		array('source' => 'Laconica'), # source attribute for Twitter
+		'memcached' =>
+		array('enabled' => false,
+			  'server' => 'localhost',
+			  'port' => 11211),
+		'inboxes' =>
+		array('enabled' => true), # on by default for new sites
+		);
+
+$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
+
+$config['db'] =
+  array('database' => 'YOU HAVE TO SET THIS IN config.php',
+	    'schema_location' => INSTALLDIR . '/classes',
+		'class_location' => INSTALLDIR . '/classes',
+		'require_prefix' => 'classes/',
+		'class_prefix' => '',
+		'mirror' => NULL,
+        'db_driver' => 'DB', # XXX: JanRain libs only work with DB
+		'quote_identifiers' => false,
+		'type' => 'mysql' );
+
+if (function_exists('date_default_timezone_set')) {
+	/* Work internally in UTC */
+	date_default_timezone_set('UTC');
+}
+
+require_once(INSTALLDIR.'/config.php');
+
+require_once('Validate.php');
+require_once('markdown.php');
+
+require_once(INSTALLDIR.'/lib/util.php');
+require_once(INSTALLDIR.'/lib/action.php');
+require_once(INSTALLDIR.'/lib/theme.php');
+require_once(INSTALLDIR.'/lib/mail.php');
+require_once(INSTALLDIR.'/lib/subs.php');
+require_once(INSTALLDIR.'/lib/Shorturl_api.php');
+require_once(INSTALLDIR.'/lib/twitter.php');
+
+function __autoload($class) {
+	if ($class == 'OAuthRequest') {
+		require_once('OAuth.php');
+	} else if (file_exists(INSTALLDIR.'/classes/' . $class . '.php')) {
+        require_once(INSTALLDIR.'/classes/' . $class . '.php');
+    }
+}
diff --git a/_darcs/pristine/lib/daemon.php b/_darcs/pristine/lib/daemon.php
new file mode 100644
index 000000000..359a4343b
--- /dev/null
+++ b/_darcs/pristine/lib/daemon.php
@@ -0,0 +1,133 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class Daemon {
+
+	function name() {
+		return NULL;
+	}
+	
+	function background() {
+		$pid = pcntl_fork();
+		if ($pid < 0) { # error
+			common_log(LOG_ERR, "Could not fork.");
+			return false;
+		} else if ($pid > 0) { # parent
+			common_log(LOG_INFO, "Successfully forked.");
+			exit(0);
+		} else { # child
+			return true;
+		}
+	}
+
+	function alreadyRunning() {
+
+		$pidfilename = $this->pidFilename();
+
+		if (!$pidfilename) {
+			return false;
+		}
+		
+		if (!file_exists($pidfilename)) {
+			return false;
+		}
+		$contents = file_get_contents($pidfilename);
+		if (posix_kill(trim($contents),0)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	function writePidFile() {
+		$pidfilename = $this->pidFilename();
+		
+		if (!$pidfilename) {
+			return false;
+		}
+		
+	    return file_put_contents($pidfilename, posix_getpid() . "\n");
+	}
+
+	function clearPidFile() {
+		$pidfilename = $this->pidFilename();
+	        if (!$pidfilename) {
+		    return false;
+		}
+	        return unlink($pidfilename);
+	}
+	
+	function pidFilename() {
+		$piddir = common_config('daemon', 'piddir');
+		if (!$piddir) {
+			return NULL;
+		}
+		$name = $this->name();
+		if (!$name) {
+			return NULL;
+		}
+		return $piddir . '/' . $name . '.pid';
+	}
+
+	function changeUser() {
+
+		$username = common_config('daemon', 'user');
+		
+		if ($username) {
+			$user_info = posix_getpwnam($username);
+			if (!$user_info) {
+				common_log(LOG_WARNING, 'Ignoring unknown user for daemon: ' . $username);
+			} else {
+				common_log(LOG_INFO, "Setting user to " . $username);
+				posix_setuid($user_info['uid']);
+			}
+		}
+
+		$groupname = common_config('daemon', 'group');
+		
+		if ($groupname) {
+			$group_info = posix_getgrnam($groupname);
+			if (!$group_info) {
+				common_log(LOG_WARNING, 'Ignoring unknown group for daemon: ' . $groupname);
+			} else {
+				common_log(LOG_INFO, "Setting group to " . $groupname);
+				posix_setgid($group_info['gid']);
+			}
+		}
+	}
+	
+	function runOnce() {
+		if ($this->alreadyRunning()) {
+			common_log(LOG_INFO, $this->name() . ' already running. Exiting.');
+			exit(0);
+		}
+		if ($this->background()) {
+			$this->writePidFile();
+			$this->changeUser();
+			$this->run();
+			$this->clearPidFile();
+		}
+	}
+	
+	function run() {
+		return true;
+	}
+}
diff --git a/_darcs/pristine/lib/deleteaction.php b/_darcs/pristine/lib/deleteaction.php
new file mode 100644
index 000000000..5ba0e7e44
--- /dev/null
+++ b/_darcs/pristine/lib/deleteaction.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class DeleteAction extends Action {
+
+	function handle($args) {
+		parent::handle($args);
+		$user = common_current_user();
+		$notice_id = $this->trimmed('notice');
+		$notice = Notice::staticGet($notice_id);
+		if (!$notice) {
+			common_user_error(_('No such notice.'));
+			exit;
+		}
+
+		$profile = $notice->getProfile();
+		$user_profile = $user->getProfile();
+
+		if (!common_logged_in()) {
+			common_user_error(_('Not logged in.'));
+			exit;
+		} else if ($notice->profile_id != $user_profile->id) {
+			common_user_error(_('Can\'t delete this notice.'));
+			exit;
+		}
+	}
+
+	function show_top($arr=NULL) {
+		$instr = $this->get_instructions();
+		$output = common_markup_to_html($instr);
+		common_element_start('div', 'instructions');
+		common_raw($output);
+		common_element_end('div');
+	}
+
+	function get_title() {
+		return NULL;
+	}
+
+	function show_header() {
+		return;
+	}
+}
diff --git a/_darcs/pristine/lib/facebookaction.php b/_darcs/pristine/lib/facebookaction.php
new file mode 100644
index 000000000..87a82ba01
--- /dev/null
+++ b/_darcs/pristine/lib/facebookaction.php
@@ -0,0 +1,283 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.	 If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/extlib/facebook/facebook.php');
+
+class FacebookAction extends Action {
+
+	function handle($args) {
+		parent::handle($args);
+	}
+
+	function get_facebook() {
+		$apikey = common_config('facebook', 'apikey');
+		$secret = common_config('facebook', 'secret');
+		return new Facebook($apikey, $secret);
+	}
+
+	function update_profile_box($facebook, $fbuid, $user) {
+
+		$notice = $user->getCurrentNotice();
+
+		# Need to include inline CSS for styling the Profile box
+
+		$style = '<style>
+		#notices {
+		clear: both;
+		margin: 0 auto;
+		padding: 0;
+		list-style-type: none;
+		width: 600px;
+		border-top: 1px solid #dec5b5;
+		}
+		#notices a:hover {
+		text-decoration: underline;
+		}
+		.notice_single {
+		clear: both;
+		display: block;
+		margin: 0;
+		padding: 5px 5px 5px 0;
+		min-height: 48px;
+		font-family: Georgia, "Times New Roman", Times, serif;
+		font-size: 13px;
+		line-height: 16px;
+		border-bottom: 1px solid #dec5b5;
+		background-color:#FCFFF5;
+		opacity:1;
+		}
+		.notice_single:hover {
+		background-color: #f7ebcc;
+		}
+		.notice_single p {
+		display: inline;
+		margin: 0;
+		padding: 0;
+		}
+		</style>';
+
+		$html = $this->render_notice($notice);
+
+		$fbml = "<fb:wide>$content $html</fb:wide>";
+		$fbml .= "<fb:narrow>$content $html</fb:narrow>";
+
+		$fbml_main = "<fb:narrow>$content $html</fb:narrow>";
+
+		$facebook->api_client->profile_setFBML(NULL, $fbuid, $fbml, NULL, NULL, $fbml_main);
+	}
+
+	# Display methods
+
+	function show_header($selected ='Home') {
+
+		# Add a timestamp to the CSS file so Facebook cache wont ignore our changes
+		$ts = filemtime(theme_file('facebookapp.css'));
+		$cssurl = theme_path('facebookapp.css') . "?ts=$ts";
+
+	 	$header = '<link rel="stylesheet" type="text/css" href="'. $cssurl . '" />';
+	 	# $header .='<script src="" ></script>';
+	  	$header .= '<fb:dashboard/>';
+
+	  	$header .=
+			'<fb:tabs>'
+			.'<fb:tab-item title="Home" href="index.php" selected="' . ($selected == 'Home') .'" />'
+			.'<fb:tab-item title="Invite Friends"  href="invite.php" selected="' . ($selected == 'Invite') . '" />'
+			.'<fb:tab-item title="Settings"	 href="settings.php" selected="' . ($selected == 'Settings') . '" />'
+			.'</fb:tabs>';
+	  	$header .= '<div id="main_body">';
+
+	  echo $header;
+
+	}
+
+	function show_footer() {
+	  $footer = '</div>';
+	  echo $footer;
+	}
+
+	function show_login_form() {
+
+		$loginform =
+			' <h2>To add the Identi.ca application, you need to log into your Identi.ca account.</h2>'
+			.'<a href="http://identi.ca/">'
+			.'	<img src="http://theme.identi.ca/identica/logo.png" alt="Identi.ca" id="logo"/>'
+			.'</a>'
+			.'<h1 class="pagetitle">Login</h1>'
+			.'<div class="instructions">'
+			.'	<p>Login with your username and password. Don\'t have a username yet?'
+			.'	  <a href="http://identi.ca/main/register">Register</a> a new account.'
+			.'	</p>'
+			.'</div>'
+			.'<div id="content">'
+			.'	<form method="post" id="login">'
+			.'	  <p>'
+			.'		<label for="nickname">Nickname</label>'
+			.'		<input name="nickname" type="text" class="input_text" id="nickname"/>'
+			.'	  </p>'
+			.'	  <p>'
+			.'		  <label for="password">Password</label>'
+			.'		<input name="password" type="password" class="password" id="password"/>'
+			.'	  </p>'
+			.'	  <p>'
+			.'		<input type="submit" id="submit" name="submit" class="submit" value="Login"/>'
+			.'	  </p>'
+			.'	</form>'
+			.'	<p>'
+			.'	  <a href="http://identi.ca/main/recoverpassword">Lost or forgotten password?</a>'
+			.'	</p>'
+			.'</div';
+
+			echo $loginform;
+	}
+
+	function render_notice($notice) {
+
+		global $config;
+
+		$profile = $notice->getProfile();
+		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+
+		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+
+		# XXX: we need to figure this out better. Is this right?
+		if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) {
+			$noticeurl = $notice->uri;
+		}
+
+		$html =
+		'<li class="notice_single" id="' . $notice->id . '">'
+		.'<a href="' . $profile->profileurl . '">'
+		.'<img src="';
+
+		if ($avatar) {
+			$html .= common_avatar_display_url($avatar);
+		} else {
+			$html .= common_default_avatar(AVATAR_STREAM_SIZE);
+		}
+
+		$html .=
+		'" class="avatar stream" width="'
+		. AVATAR_STREAM_SIZE . '" height="' . AVATAR_STREAM_SIZE .'"'
+		.' alt="';
+
+		if ($profile->fullname) {
+			$html .= $profile->fullname;
+		} else {
+			$html .= $profile->nickname;
+		}
+
+		$html .=
+		'"></a>'
+		.'<a href="' .	$profile->profileurl . '" class="nickname">' . $profile->nickname . '</a>'
+		.'<p class="content">' . $notice->rendered . '</p>'
+		.'<p class="time">'
+		.'<a class="permalink" href="' . $noticeurl . '" title="' . common_exact_date($notice->created) . '">' . common_date_string($notice->created) . '</a>';
+
+		if ($notice->source) {
+			$html .= _(' from ');
+			$html .= $this->source_link($notice->source);
+		}
+
+		if ($notice->reply_to) {
+			$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+			$html .=
+			' (<a class="inreplyto" href="' . $replyurl . '">' . _('in reply to...') . ')';
+		}
+
+		$html .= '</p></li>';
+
+		return $html;
+	}
+
+	function source_link($source) {
+		$source_name = _($source);
+
+		$html = '<span class="noticesource">';
+
+		switch ($source) {
+		 case 'web':
+		 case 'xmpp':
+		 case 'mail':
+		 case 'omb':
+		 case 'api':
+			$html .= $source_name;
+			break;
+		 default:
+			$ns = Notice_source::staticGet($source);
+			if ($ns) {
+				$html .= '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+			} else {
+				$html .= $source_name;
+			}
+			break;
+		}
+
+		$html .= '</span>';
+
+		return $html;
+	}
+
+	function pagination($have_before, $have_after, $page, $fbaction, $args=NULL) {
+
+		$html = '';
+
+		if ($have_before || $have_after) {
+			$html = '<div id="pagination">';
+			$html .'<ul id="nav_pagination">';
+		}
+
+		if ($have_before) {
+			$pargs = array('page' => $page-1);
+			$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+			$html .= '<li class="before">';
+			$html .'<a href="' . $this->pagination_url($fbaction, $newargs) . '">' . _('« After') . '</a>';
+			$html .'</li>';
+		}
+
+		if ($have_after) {
+			$pargs = array('page' => $page+1);
+			$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+			$html .= '<li class="after">';
+			$html .'<a href="' . $this->pagination_url($fbaction, $newargs) . '">' . _('Before »') . '</a>';
+			$html .'</li>';
+		}
+
+		if ($have_before || $have_after) {
+			$html .= '<ul>';
+			$html .'<div>';
+		}
+	}
+
+	function pagination_url($fbaction, $args=NULL) {
+		global $config;
+
+		$extra = '';
+
+		if ($args) {
+			foreach ($args as $key => $value) {
+				$extra .= "&${key}=${value}";
+			}
+		}
+
+		return "$fbaction?${extra}";
+	}
+
+}
diff --git a/_darcs/pristine/lib/gallery.php b/_darcs/pristine/lib/gallery.php
new file mode 100644
index 000000000..0dd351bab
--- /dev/null
+++ b/_darcs/pristine/lib/gallery.php
@@ -0,0 +1,320 @@
+<?php
+
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/profilelist.php');
+
+# 10x8
+
+define('AVATARS_PER_PAGE', 80);
+
+class GalleryAction extends Action {
+
+	function is_readonly() {
+		return true;
+	}
+
+	function handle($args) {
+		parent::handle($args);
+
+		# Post from the tag dropdown; redirect to a GET
+
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+		    common_redirect($this->self_url(), 307);
+		}
+
+		$nickname = common_canonical_nickname($this->arg('nickname'));
+		$user = User::staticGet('nickname', $nickname);
+
+		if (!$user) {
+			$this->no_such_user();
+			return;
+		}
+
+		$profile = $user->getProfile();
+
+		if (!$profile) {
+			$this->server_error(_('User without matching profile in system.'));
+			return;
+		}
+
+		$page = $this->arg('page');
+
+		if (!$page) {
+			$page = 1;
+		}
+
+		$display = $this->arg('display');
+
+		if (!$display) {
+			$display = 'list';
+		}
+
+		$tag = $this->arg('tag');
+
+		common_show_header($profile->nickname . ": " . $this->gallery_type(),
+						   NULL, $profile,
+						   array($this, 'show_top'));
+
+		$this->display_links($profile, $page, $display);
+		$this->show_tags_dropdown($profile);
+
+		$this->show_gallery($profile, $page, $display, $tag);
+		common_show_footer();
+	}
+
+	function no_such_user() {
+		$this->client_error(_('No such user.'));
+	}
+
+	function show_tags_dropdown($profile) {
+		$tag = $this->trimmed('tag');
+		list($lst, $usr) = $this->fields();
+		$tags = $this->get_all_tags($profile, $lst, $usr);
+		$content = array();
+		foreach ($tags as $t) {
+			$content[$t] = $t;
+		}
+		if ($tags) {
+			common_element_start('dl', array('id'=>'filter_tags'));
+			common_element('dt', null, _('Filter tags'));
+			common_element_start('dd');
+			common_element_start('ul');
+			common_element_start('li', array('id'=>'filter_tags_all', 'class'=>'child_1'));
+			common_element('a', array('href' => common_local_url($this->trimmed('action'),
+																 array('nickname' => $profile->nickname))),
+						   _('All'));
+			common_element_end('li');
+			common_element_start('li', array('id'=>'filter_tags_item'));
+			common_element_start('form', array('name' => 'bytag', 'id' => 'bytag', 'method' => 'post'));
+			common_dropdown('tag', _('Tag'), $content,
+							_('Choose a tag to narrow list'), FALSE, $tag);
+			common_submit('go', _('Go'));
+			common_element_end('form');
+			common_element_end('li');
+			common_element_end('ul');
+			common_element_end('dd');
+			common_element_end('dl');
+		}
+	}
+
+	function show_top($profile) {
+		common_element('div', 'instructions',
+					   $this->get_instructions($profile));
+        $this->show_menu();
+	}
+
+    function show_menu() {
+		# action => array('prompt', 'title', $args)
+		$action = $this->trimmed('action');
+		$nickname = $this->trimmed('nickname');
+		$menu =
+		  array('subscriptions' =>
+				array( _('Subscriptions'),
+					   _('Subscriptions'),
+                      array('nickname' => $nickname)),
+				'subscribers' =>
+				array(
+					  _('Subscribers'),
+					  _('Subscribers'),
+                      array('nickname' => $nickname)),
+				);
+		$this->nav_menu($menu);
+	}
+
+	function show_gallery($profile, $page, $display='list', $tag=NULL) {
+
+		$other = new Profile();
+
+		list($lst, $usr) = $this->fields();
+
+		$per_page = ($display == 'list') ? PROFILES_PER_PAGE : AVATARS_PER_PAGE;
+
+		$offset = ($page-1)*$per_page;
+		$limit = $per_page + 1;
+
+		if (common_config('db','type') == 'pgsql') {
+			$lim = ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+		} else {
+			$lim = ' LIMIT ' . $offset . ', ' . $limit;
+		}
+
+		# XXX: memcached results
+		# FIXME: SQL injection on $tag
+
+		$other->query('SELECT profile.* ' .
+					  'FROM profile JOIN subscription ' .
+					  'ON profile.id = subscription.' . $lst . ' ' .
+					  (($tag) ? 'JOIN profile_tag ON (profile.id = profile_tag.tagged AND subscription.'.$usr.'= profile_tag.tagger) ' : '') .
+					  'WHERE ' . $usr . ' = ' . $profile->id . ' ' .
+					  'AND subscriber != subscribed ' .
+					  (($tag) ? 'AND profile_tag.tag= "' . $tag . '" ': '') .
+					  'ORDER BY subscription.created DESC, profile.id DESC ' .
+					  $lim);
+
+		if ($display == 'list') {
+            $cls = $this->profile_list_class();
+			$profile_list = new $cls($other, $profile, $this->trimmed('action'));
+			$cnt = $profile_list->show_list();
+		} else {
+			$cnt = $this->icon_list($other);
+		}
+
+		# For building the pagination URLs
+
+		$args = array('nickname' => $profile->nickname);
+
+		if ($display != 'list') {
+			$args['display'] = $display;
+		}
+
+		common_pagination($page > 1,
+						  $cnt > $per_page,
+						  $page,
+						  $this->trimmed('action'),
+						  $args);
+	}
+
+    function profile_list_class() {
+        return 'ProfileList';
+    }
+
+	function icon_list($other) {
+
+		common_element_start('ul', $this->div_class());
+
+		$cnt = 0;
+
+		while ($other->fetch()) {
+
+			$cnt++;
+
+			if ($cnt > AVATARS_PER_PAGE) {
+				break;
+			}
+
+			common_element_start('li');
+
+			common_element_start('a', array('title' => ($other->fullname) ?
+											$other->fullname :
+											$other->nickname,
+											'href' => $other->profileurl,
+											'class' => 'subscription'));
+			$avatar = $other->getAvatar(AVATAR_STREAM_SIZE);
+			common_element('img',
+						   array('src' =>
+								 (($avatar) ? common_avatar_display_url($avatar) :
+								  common_default_avatar(AVATAR_STREAM_SIZE)),
+								 'width' => AVATAR_STREAM_SIZE,
+								 'height' => AVATAR_STREAM_SIZE,
+								 'class' => 'avatar stream',
+								 'alt' => ($other->fullname) ?
+								 $other->fullname :
+								 $other->nickname));
+			common_element_end('a');
+
+			# XXX: subscribe form here
+
+			common_element_end('li');
+		}
+
+		common_element_end('ul');
+
+		return $cnt;
+	}
+
+	function gallery_type() {
+		return NULL;
+	}
+
+	function get_instructions(&$profile) {
+		return NULL;
+	}
+
+	function fields() {
+		return NULL;
+	}
+
+	function div_class() {
+		return '';
+	}
+
+	function display_links($profile, $page, $display) {
+		$tag = $this->trimmed('tag');
+
+		common_element_start('dl', array('id'=>'subscriptions_nav'));
+		common_element('dt', null, _('Subscriptions navigation'));
+		common_element_start('dd');
+		common_element_start('ul', array('class'=>'nav'));
+
+		switch ($display) {
+		 case 'list':
+			common_element('li', array('class'=>'child_1'), _('List'));
+			common_element_start('li');
+			$url_args = array('display' => 'icons',
+							  'nickname' => $profile->nickname,
+							  'page' => 1 + floor((($page - 1) * PROFILES_PER_PAGE) / AVATARS_PER_PAGE));
+			if ($tag) {
+				$url_args['tag'] = $tag;
+			}
+			$url = common_local_url($this->trimmed('action'), $url_args);
+			common_element('a', array('href' => $url),
+						   _('Icons'));
+			common_element_end('li');
+			break;
+		 default:
+			common_element_start('li', array('class'=>'child_1'));
+			$url_args = array('nickname' => $profile->nickname,
+							  'page' => 1 + floor((($page - 1) * AVATARS_PER_PAGE) / PROFILES_PER_PAGE));
+			if ($tag) {
+				$url_args['tag'] = $tag;
+			}
+			$url = common_local_url($this->trimmed('action'), $url_args);
+			common_element('a', array('href' => $url),
+						   _('List'));
+			common_element_end('li');
+			common_element('li', NULL, _('Icons'));
+			break;
+		}
+
+		common_element_end('ul');
+		common_element_end('dd');
+		common_element_end('dl');
+	}
+
+	# Get list of tags we tagged other users with
+
+	function get_all_tags($profile, $lst, $usr) {
+		$profile_tag = new Notice_tag();
+		$profile_tag->query('SELECT DISTINCT(tag) ' .
+							'FROM profile_tag, subscription ' .
+							'WHERE tagger = ' . $profile->id . ' ' .
+							'AND ' . $usr . ' = ' . $profile->id . ' ' .
+							'AND ' . $lst . ' = tagged ' .
+							'AND tagger != tagged');
+		$tags = array();
+		while ($profile_tag->fetch()) {
+			$tags[] = $profile_tag->tag;
+		}
+		$profile_tag->free();
+		return $tags;
+	}
+}
\ No newline at end of file
diff --git a/_darcs/pristine/lib/jabber.php b/_darcs/pristine/lib/jabber.php
new file mode 100644
index 000000000..ab0fd6af8
--- /dev/null
+++ b/_darcs/pristine/lib/jabber.php
@@ -0,0 +1,300 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once('XMPPHP/XMPP.php');
+
+function jabber_valid_base_jid($jid) {
+	# Cheap but effective
+	return Validate::email($jid);
+}
+
+function jabber_normalize_jid($jid) {
+	if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
+		$node = $matches[1];
+		$server = $matches[2];
+		return strtolower($node.'@'.$server);
+	} else {
+		return NULL;
+	}
+}
+
+function jabber_daemon_address() {
+	return common_config('xmpp', 'user') . '@' . common_config('xmpp', 'server');
+}
+
+function jabber_connect($resource=NULL) {
+	static $conn = NULL;
+	if (!$conn) {
+		$conn = new XMPPHP_XMPP(common_config('xmpp', 'host') ?
+								common_config('xmpp', 'host') :
+								common_config('xmpp', 'server'),
+								common_config('xmpp', 'port'),
+								common_config('xmpp', 'user'),
+								common_config('xmpp', 'password'),
+								($resource) ? $resource :
+								common_config('xmpp', 'resource'),
+								common_config('xmpp', 'server'),
+								common_config('xmpp', 'debug') ?
+								true : false,
+								common_config('xmpp', 'debug') ?
+								XMPPHP_Log::LEVEL_VERBOSE :  NULL
+								);
+
+		if (!$conn) {
+			return false;
+		}
+
+		$conn->autoSubscribe();
+		$conn->useEncryption(common_config('xmpp', 'encryption'));
+
+		try {
+			$conn->connect(true); # true = persistent connection
+		} catch (XMPPHP_Exception $e) {
+			common_log(LOG_ERROR, $e->getMessage());
+			return false;
+		}
+
+    	$conn->processUntil('session_start');
+	}
+	return $conn;
+}
+
+function jabber_send_notice($to, $notice) {
+	$conn = jabber_connect();
+	if (!$conn) {
+		return false;
+	}
+	$profile = Profile::staticGet($notice->profile_id);
+	if (!$profile) {
+		common_log(LOG_WARNING, 'Refusing to send notice with ' .
+		           'unknown profile ' . common_log_objstring($notice),
+		           __FILE__);
+		return false;
+	}
+	$msg = jabber_format_notice($profile, $notice);
+	$entry = jabber_format_entry($profile, $notice);
+	$conn->message($to, $msg, 'chat', NULL, $entry);
+	$profile->free();
+	return true;
+}
+
+# Extra stuff defined by Twitter, needed by twitter clients
+
+function jabber_format_entry($profile, $notice) {
+
+	# FIXME: notice url might be remote
+
+	$noticeurl = common_local_url('shownotice',
+								  array('notice' => $notice->id));
+	$msg = jabber_format_notice($profile, $notice);
+	$entry = "\n<entry xmlns='http://www.w3.org/2005/Atom'>\n";
+	$entry .= "<source>\n";
+	$entry .= "<title>" . $profile->nickname . " - " . common_config('site', 'name') . "</title>\n";
+	$entry .= "<link href='" . htmlspecialchars($profile->profileurl) . "'/>\n";
+	$entry .= "<link rel='self' type='application/rss+xml' href='" . common_local_url('userrss', array('nickname' => $profile->nickname)) . "'/>\n";
+	$entry .= "<author><name>" . $profile->nickname . "</name></author>\n";
+	$entry .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
+	$entry .= "</source>\n";
+	$entry .= "<title>" . htmlspecialchars($msg) . "</title>\n";
+	$entry .= "<summary>" . htmlspecialchars($msg) . "</summary>\n";
+	$entry .= "<link rel='alternate' href='" . $noticeurl . "' />\n";
+	$entry .= "<id>". $notice->uri . "</id>\n";
+	$entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
+	$entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
+	$entry .= "</entry>\n";
+
+	$html = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
+	$html .= "<body xmlns='http://www.w3.org/1999/xhtml'>\n";
+	$html .= "<a href='".htmlspecialchars($profile->profileurl)."'>".$profile->nickname."</a>: ";
+	$html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice);
+	$html .= "\n</body>\n";
+	$html .= "\n</html>\n";
+
+	$address = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
+	$address .= "<address type='replyto' jid='" . jabber_daemon_address() . "' />\n";
+	$address .= "</addresses>\n";
+
+	# FIXME: include a pubsub event, too.
+
+	return $html . $entry . $address;
+}
+
+function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
+	$conn = jabber_connect();
+	if (!$conn) {
+		return false;
+	}
+	$conn->message($to, $body, $type, $subject);
+	return true;
+}
+
+function jabber_send_presence($status, $show='available', $to=NULL,
+							  $type = 'available', $priority=NULL)
+{
+	$conn = jabber_connect();
+	if (!$conn) {
+		return false;
+	}
+	$conn->presence($status, $show, $to, $type, $priority);
+	return true;
+}
+
+function jabber_confirm_address($code, $nickname, $address) {
+	$body = 'User "' . $nickname . '" on ' . common_config('site', 'name') . ' ' .
+			'has said that your Jabber ID belongs to them. ' .
+    	    'If that\'s true, you can confirm by clicking on this URL: ' .
+        	common_local_url('confirmaddress', array('code' => $code)) .
+        	' . (If you cannot click it, copy-and-paste it into the ' .
+        	'address bar of your browser). If that user isn\'t you, ' .
+        	'or if you didn\'t request this confirmation, just ignore this message.';
+
+	return jabber_send_message($address, $body);
+}
+
+function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
+	$conn = jabber_connect();
+
+	$to = htmlspecialchars($to);
+	$status = htmlspecialchars($status);
+	$out = "<presence";
+	if($to) $out .= " to='$to'";
+	if($type) $out .= " type='$type'";
+	if($show == 'available' and !$status) {
+		$out .= "/>";
+	} else {
+		$out .= ">";
+		if($show && ($show != 'available')) $out .= "<show>$show</show>";
+		if($status) $out .= "<status>$status</status>";
+		$out .= "</presence>";
+	}
+	$conn->send($out);
+}
+
+function jabber_broadcast_notice($notice) {
+
+	if (!common_config('xmpp', 'enabled')) {
+		return true;
+	}
+	$profile = Profile::staticGet($notice->profile_id);
+
+	if (!$profile) {
+		common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
+		           'unknown profile ' . common_log_objstring($notice),
+		           __FILE__);
+		return false;
+	}
+
+	$msg = jabber_format_notice($profile, $notice);
+	$entry = jabber_format_entry($profile, $notice);
+
+	$profile->free();
+	unset($profile);
+
+	$sent_to = array();
+	$conn = jabber_connect();
+
+	# First, get users to whom this is a direct reply
+	$user = new User();
+	$user->query('SELECT user.id, user.jabber ' .
+				 'FROM user JOIN reply ON user.id = reply.profile_id ' .
+				 'WHERE reply.notice_id = ' . $notice->id . ' ' .
+				 'AND user.jabber is not null ' .
+				 'AND user.jabbernotify = 1 ' .
+				 'AND user.jabberreplies = 1 ');
+
+	while ($user->fetch()) {
+		common_log(LOG_INFO,
+				   'Sending reply notice ' . $notice->id . ' to ' . $user->jabber,
+				   __FILE__);
+		$conn->message($user->jabber, $msg, 'chat', NULL, $entry);
+		$conn->processTime(0);
+		$sent_to[$user->id] = 1;
+	}
+
+	$user->free();
+
+    # Now, get users subscribed to this profile
+
+	$user = new User();
+	$user->query('SELECT user.id, user.jabber ' .
+				 'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
+				 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
+				 'AND user.jabber is not null ' .
+				 'AND user.jabbernotify = 1 ' .
+                 'AND subscription.jabber = 1 ');
+
+	while ($user->fetch()) {
+		if (!array_key_exists($user->id, $sent_to)) {
+			common_log(LOG_INFO,
+					   'Sending notice ' . $notice->id . ' to ' . $user->jabber,
+					   __FILE__);
+			$conn->message($user->jabber, $msg, 'chat', NULL, $entry);
+			# To keep the incoming queue from filling up, we service it after each send.
+			$conn->processTime(0);
+		}
+	}
+
+	$user->free();
+
+	return true;
+}
+
+function jabber_public_notice($notice) {
+
+	# Now, users who want everything
+
+	$public = common_config('xmpp', 'public');
+
+	# FIXME PRIV don't send out private messages here
+	# XXX: should we send out non-local messages if public,localonly
+	# = false? I think not
+
+	if ($public && $notice->is_local) {
+		$profile = Profile::staticGet($notice->profile_id);
+
+		if (!$profile) {
+			common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
+					   'unknown profile ' . common_log_objstring($notice),
+					   __FILE__);
+			return false;
+		}
+
+		$msg = jabber_format_notice($profile, $notice);
+		$entry = jabber_format_entry($profile, $notice);
+
+		$conn = jabber_connect();
+
+		foreach ($public as $address) {
+			common_log(LOG_INFO,
+					   'Sending notice ' . $notice->id . ' to public listener ' . $address,
+					   __FILE__);
+			$conn->message($address, $msg, 'chat', NULL, $entry);
+			$conn->processTime(0);
+		}
+		$profile->free();
+	}
+
+	return true;
+}
+
+function jabber_format_notice(&$profile, &$notice) {
+	return $profile->nickname . ': ' . $notice->content;
+}
diff --git a/_darcs/pristine/lib/language.php b/_darcs/pristine/lib/language.php
new file mode 100644
index 000000000..796e28870
--- /dev/null
+++ b/_darcs/pristine/lib/language.php
@@ -0,0 +1,93 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+
+
+function client_prefered_language($httplang) {
+        $client_langs = array();
+        $all_languages = common_config('site','languages');
+
+        preg_match_all('"(((\S\S)-?(\S\S)?)(;q=([0-9.]+))?)\s*(,\s*|$)"',strtolower($httplang),$httplang);
+        for ($i = 0; $i < count($httplang); $i++) {
+             if(!empty($httplang[2][$i])) {
+                    #if no q default to 1.0
+                    $client_langs[$httplang[2][$i]] = ($httplang[6][$i]? (float) $httplang[6][$i] : 1.0);
+                }
+                if(!empty($httplang[3][$i]) && empty($client_langs[$httplang[3][$i]])) {
+                    #if a catchall default 0.01 lower
+                    $client_langs[$httplang[3][$i]] = ($httplang[6][$i]? (float) $httplang[6][$i]-0.01 : 0.99);
+                }
+            }
+            #sort in decending q
+            arsort($client_langs);
+
+            foreach ($client_langs as $lang => $q) {
+                if (isset($all_languages[$lang])) {
+                    return($all_languages[$lang]['lang']);
+                }
+            }
+            return FALSE;
+}
+
+function get_nice_language_list() {
+        $nice_lang = array();
+        $all_languages = common_config('site','languages');
+        foreach ($all_languages as $lang) {
+                $nice_lang = $nice_lang + array($lang['lang'] => $lang['name']);
+        }
+        return $nice_lang;
+}
+
+// Get a list of all languages that are enabled in the default config. This
+// should ONLY be called when setting up the default config in common.php.
+// Any other attempt to get a list of lanugages should instead call
+// common_config('site','languages')
+function get_all_languages() {
+	return array(
+		'en-us' => array('q' => 1, 'lang' => 'en_US', 'name' => 'English (US)', 'direction' => 'ltr'),
+		'en-nz' => array('q' => 1, 'lang' => 'en_NZ', 'name' => 'English (NZ)', 'direction' => 'ltr'),
+		'en-gb' => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
+		'en'    => array('q' => 1, 'lang' => 'en',    'name' => 'English', 'direction' => 'ltr'),
+		'da'    => array('q' => 0.1, 'lang' => 'da_DK', 'name' => 'Danish', 'direction' => 'ltr'),
+		'nl'    => array('q' => 1, 'lang' => 'nl_NL', 'name' => 'Dutch', 'direction' => 'ltr'),
+		'eo'    => array('q' => 0.1, 'lang' => 'eo',    'name' => 'Esperanto', 'direction' => 'ltr'),
+		'fr-fr' => array('q' => 0.9, 'lang' => 'fr_FR', 'name' => 'French', 'direction' => 'ltr'),
+		'de'    => array('q' => 1, 'lang' => 'de_DE', 'name' => 'German', 'direction' => 'ltr'),
+		'it'    => array('q' => 1, 'lang' => 'it_IT', 'name' => 'Italian', 'direction' => 'ltr'),
+		'ko'    => array('q' => 0.1, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
+		'nb'    => array('q' => 1, 'lang' => 'nb_NO', 'name' => 'Norwegian (bokmal)', 'direction' => 'ltr'),
+		'pt'    => array('q' => 0.2, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
+		'pt-br' => array('q' => 1, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
+#		'ru'    => array('q' => 0.1, 'lang' => 'ru_RU', 'name' => 'Russian', 'direction' => 'ltr'),
+		'es'    => array('q' => 1, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
+		'tr'    => array('q' => 1, 'lang' => 'tr_TR', 'name' => 'Turkish', 'direction' => 'ltr'),
+		'uk'    => array('q' => 1, 'lang' => 'uk_UA', 'name' => 'Ukrainian', 'direction' => 'ltr'),
+#		'lt'    => array('q' => 0.1, 'lang' => 'lt_LT', 'name' => 'Lithuanian', 'direction' => 'ltr'),
+#		'sv'    => array('q' => 1, 'lang' => 'sv_SE', 'name' => 'Swedish', 'direction' => 'ltr'),
+		'pl'	=> array('q' => 1, 'lang' => 'pl_PL', 'name' => 'Polish', 'direction' => 'ltr'),
+		'mk'	=> array('q' => 1, 'lang' => 'mk_MK', 'name' => 'Macedonian', 'direction' => 'ltr'),
+		'jp'	=> array('q' => 0.1, 'lang' => 'ja_JP', 'name' => 'Japanese', 'direction' => 'ltr'),
+		'cs'	=> array('q' => 1, 'lang' => 'cs_CZ', 'name' => 'Czech', 'direction' => 'ltr'),
+		'ca'	=> array('q' => 1, 'lang' => 'ca_ES', 'name' => 'Catalan', 'direction' => 'ltr'),
+#		'hr'    => array('q' => 0.1, 'lang' => 'he_IL', 'name' => 'Hebrew', 'direction' => 'ltr')
+	);
+}
+
diff --git a/_darcs/pristine/lib/mail.php b/_darcs/pristine/lib/mail.php
new file mode 100644
index 000000000..a7cbab858
--- /dev/null
+++ b/_darcs/pristine/lib/mail.php
@@ -0,0 +1,309 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once('Mail.php');
+
+function mail_backend() {
+	static $backend = NULL;
+
+	if (!$backend) {
+		global $config;
+		$backend = Mail::factory($config['mail']['backend'],
+								 ($config['mail']['params']) ? $config['mail']['params'] : array());
+		if (PEAR::isError($backend)) {
+			common_server_error($backend->getMessage(), 500);
+		}
+	}
+	return $backend;
+}
+
+# XXX: use Mail_Queue... maybe
+
+function mail_send($recipients, $headers, $body) {
+	$backend = mail_backend();
+    if (!isset($headers['Content-Type'])) {
+        $headers['Content-Type'] = 'text/plain; charset=UTF-8';
+    }
+	assert($backend); # throws an error if it's bad
+	$sent = $backend->send($recipients, $headers, $body);
+	if (PEAR::isError($sent)) {
+		common_log(LOG_ERR, 'Email error: ' . $sent->getMessage());
+		return false;
+	}
+	return true;
+}
+
+function mail_domain() {
+	$maildomain = common_config('mail', 'domain');
+	if (!$maildomain) {
+		$maildomain = common_config('site', 'server');
+	}
+	return $maildomain;
+}
+
+function mail_notify_from() {
+	$notifyfrom = common_config('mail', 'notifyfrom');
+	if (!$notifyfrom) {
+		$domain = mail_domain();
+		$notifyfrom = common_config('site', 'name') .' <noreply@'.$domain.'>';
+	}
+	return $notifyfrom;
+}
+
+function mail_to_user(&$user, $subject, $body, $address=NULL) {
+	if (!$address) {
+		$address = $user->email;
+	}
+
+	$recipients = $address;
+	$profile = $user->getProfile();
+
+	$headers['From'] = mail_notify_from();
+	$headers['To'] = $profile->getBestName() . ' <' . $address . '>';
+	$headers['Subject'] = $subject;
+
+	return mail_send($recipients, $headers, $body);
+}
+
+# For confirming a Jabber address
+
+function mail_confirm_address($user, $code, $nickname, $address) {
+
+	$subject = _('Email address confirmation');
+
+    $body = sprintf(_("Hey, %s.\n\nSomeone just entered this email address on %s.\n\n" .
+        "If it was you, and you want to confirm your entry, use the URL below:\n\n\t%s\n\n" .
+        "If not, just ignore this message.\n\nThanks for your time, \n%s\n")
+        , $nickname, common_config('site', 'name')
+        , common_local_url('confirmaddress', array('code' => $code)), common_config('site', 'name'));
+     return mail_to_user($user, $subject, $body, $address);
+}
+
+function mail_subscribe_notify($listenee, $listener) {
+	$other = $listener->getProfile();
+	mail_subscribe_notify_profile($listenee, $other);
+}
+
+function mail_subscribe_notify_profile($listenee, $other) {
+	if ($listenee->email && $listenee->emailnotifysub) {
+        // use the recipients localization
+        common_init_locale($listenee->language);
+		$profile = $listenee->getProfile();
+		$name = $profile->getBestName();
+		$long_name = ($other->fullname) ? ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
+		$recipients = $listenee->email;
+		$headers['From'] = mail_notify_from();
+		$headers['To'] = $name . ' <' . $listenee->email . '>';
+		$headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $other->getBestName(),
+									  common_config('site', 'name'));
+		$body  = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
+						   "\t".'%3$s'."\n\n".
+						   'Faithfully yours,'."\n".'%4$s.'."\n"),
+						 $long_name,
+						 common_config('site', 'name'),
+						 $other->profileurl,
+						 common_config('site', 'name'));
+
+        // reset localization
+        common_init_locale();
+		mail_send($recipients, $headers, $body);
+	}
+}
+
+function mail_new_incoming_notify($user) {
+
+	$profile = $user->getProfile();
+	$name = $profile->getBestName();
+
+	$headers['From'] = $user->incomingemail;
+	$headers['To'] = $name . ' <' . $user->email . '>';
+	$headers['Subject'] = sprintf(_('New email address for posting to %s'),
+								  common_config('site', 'name'));
+
+	$body  = sprintf(_("You have a new posting address on %1\$s.\n\n".
+					   "Send email to %2\$s to post new messages.\n\n".
+					   "More email instructions at %3\$s.\n\n".
+					   "Faithfully yours,\n%4\$s"),
+					 common_config('site', 'name'),
+					 $user->incomingemail,
+					 common_local_url('doc', array('title' => 'email')),
+					 common_config('site', 'name'));
+
+	mail_send($user->email, $headers, $body);
+}
+
+function mail_new_incoming_address() {
+	$prefix = common_confirmation_code(64);
+	$suffix = mail_domain();
+	return $prefix . '@' . $suffix;
+}
+
+function mail_broadcast_notice_sms($notice) {
+
+    # Now, get users subscribed to this profile
+
+	$user = new User();
+
+	$user->query('SELECT nickname, smsemail, incomingemail ' .
+				 'FROM user JOIN subscription ' .
+				 'ON user.id = subscription.subscriber ' .
+				 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
+				 'AND user.smsemail IS NOT NULL ' .
+				 'AND user.smsnotify = 1 ' .
+                 'AND subscription.sms = 1 ');
+
+	while ($user->fetch()) {
+		common_log(LOG_INFO,
+				   'Sending notice ' . $notice->id . ' to ' . $user->smsemail,
+				   __FILE__);
+		$success = mail_send_sms_notice_address($notice, $user->smsemail, $user->incomingemail);
+		if (!$success) {
+			# XXX: Not sure, but I think that's the right thing to do
+			common_log(LOG_WARNING,
+					   'Sending notice ' . $notice->id . ' to ' . $user->smsemail . ' FAILED, cancelling.',
+					   __FILE__);
+			return false;
+		}
+	}
+
+	$user->free();
+	unset($user);
+
+	return true;
+}
+
+function mail_send_sms_notice($notice, $user) {
+	return mail_send_sms_notice_address($notice, $user->smsemail, $user->incomingemail);
+}
+
+function mail_send_sms_notice_address($notice, $smsemail, $incomingemail) {
+
+	$to = $nickname . ' <' . $smsemail . '>';
+	$other = $notice->getProfile();
+
+	common_log(LOG_INFO, "Sending notice " . $notice->id . " to " . $smsemail, __FILE__);
+
+	$headers = array();
+	$headers['From'] = (isset($incomingemail)) ? $incomingemail : mail_notify_from();
+	$headers['To'] = $to;
+	$headers['Subject'] = sprintf(_('%s status'),
+								  $other->getBestName());
+	$body = $notice->content;
+
+	return mail_send($smsemail, $headers, $body);
+}
+
+function mail_confirm_sms($code, $nickname, $address) {
+
+	$recipients = $address;
+
+	$headers['From'] = mail_notify_from();
+	$headers['To'] = $nickname . ' <' . $address . '>';
+	$headers['Subject'] = _('SMS confirmation');
+
+	$body = "$nickname: confirm you own this phone number with this code:";
+	$body .= "\n\n";
+	$body .= $code;
+	$body .= "\n\n";
+
+	mail_send($recipients, $headers, $body);
+}
+
+function mail_notify_nudge($from, $to) {
+    common_init_locale($to->language);
+	$subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname);
+
+	$from_profile = $from->getProfile();
+
+	$body = sprintf(_("%1\$s (%2\$s) is wondering what you are up to these days and is inviting you to post some news.\n\n".
+					  "So let's hear from you :)\n\n".
+					  "%3\$s\n\n".
+					  "Don't reply to this email; it won't get to them.\n\n".
+					  "With kind regards,\n".
+					  "%4\$s\n"),
+					$from_profile->getBestName(),
+					$from->nickname,
+					common_local_url('all', array('nickname' => $to->nickname)),
+					common_config('site', 'name'));
+    common_init_locale();
+	return mail_to_user($to, $subject, $body);
+}
+
+function mail_notify_message($message, $from=NULL, $to=NULL) {
+
+	if (is_null($from)) {
+		$from = User::staticGet('id', $message->from_profile);
+	}
+
+	if (is_null($to)) {
+		$to = User::staticGet('id', $message->to_profile);
+	}
+
+	if (is_null($to->email) || !$to->emailnotifymsg) {
+		return true;
+	}
+
+    common_init_locale($to->language);
+	$subject = sprintf(_('New private message from %s'), $from->nickname);
+
+	$from_profile = $from->getProfile();
+
+	$body = sprintf(_("%1\$s (%2\$s) sent you a private message:\n\n".
+					  "------------------------------------------------------\n".
+					  "%3\$s\n".
+					  "------------------------------------------------------\n\n".
+					  "You can reply to their message here:\n\n".
+					  "%4\$s\n\n".
+					  "Don't reply to this email; it won't get to them.\n\n".
+					  "With kind regards,\n".
+					  "%5\$s\n"),
+					$from_profile->getBestName(),
+					$from->nickname,
+					$message->content,
+					common_local_url('newmessage', array('to' => $from->id)),
+					common_config('site', 'name'));
+
+    common_init_locale();
+	return mail_to_user($to, $subject, $body);
+}
+
+function mail_notify_fave($other, $user, $notice) {
+
+	$profile = $user->getProfile();
+	$bestname = $profile->getBestName();
+    common_init_locale($other->language);
+	$subject = sprintf(_('%s added your notice as a favorite'), $bestname);
+	$body = sprintf(_("%1\$s just added your notice from %2\$s as one of their favorites.\n\n" .
+					  "In case you forgot, you can see the text of your notice here:\n\n" .
+					  "%3\$s\n\n" .
+					  "You can see the list of %1\$s's favorites here:\n\n" .
+					  "%4\$s\n\n" .
+					  "Faithfully yours,\n" .
+					  "%5\$s\n"),
+					$bestname,
+					common_exact_date($notice->created),
+					common_local_url('shownotice', array('notice' => $notice->id)),
+					common_local_url('showfavorites', array('nickname' => $user->nickname)),
+					common_config('site', 'name'));
+
+    common_init_locale();
+	mail_to_user($other, $subject, $body);
+}
diff --git a/_darcs/pristine/lib/mailbox.php b/_darcs/pristine/lib/mailbox.php
new file mode 100644
index 000000000..4ed8d1758
--- /dev/null
+++ b/_darcs/pristine/lib/mailbox.php
@@ -0,0 +1,172 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/personal.php');
+
+define('MESSAGES_PER_PAGE', 20);
+
+class MailboxAction extends PersonalAction {
+	
+	function handle($args) {
+
+		parent::handle($args);
+
+		$nickname = common_canonical_nickname($this->arg('nickname'));
+		$user = User::staticGet('nickname', $nickname);
+
+		if (!$user) {
+			$this->client_error(_('No such user.'), 404);
+			return;
+		}
+
+		$cur = common_current_user();
+		
+		if (!$cur || $cur->id != $user->id) {
+			$this->client_error(_('Only the user can read their own mailboxes.'), 403);
+			return;
+		}
+		
+		$profile = $user->getProfile();
+
+		if (!$profile) {
+			$this->server_error(_('User has no profile.'));
+			return;
+		}
+
+		$page = $this->trimmed('page');
+		
+		if (!$page) {
+			$page = 1;
+		}
+		
+		$this->show_page($user, $page);
+	}
+
+	function get_title($user, $page) {
+		return '';
+	}
+
+	function get_instructions() {
+		return '';
+	}
+
+	function show_top() {
+
+		$cur = common_current_user();
+		
+		common_message_form(NULL, $cur, NULL);
+		
+		$this->views_menu();
+	}
+	
+	function show_page($user, $page) {
+
+		common_show_header($this->get_title($user, $page),
+						   NULL, NULL,
+						   array($this, 'show_top'));
+		
+		$this->show_box($user, $page);
+		
+		common_show_footer();
+	}
+	
+	function show_box($user, $page) {
+		
+		$message = $this->get_messages($user, $page);
+		
+		if ($message) {
+			
+			$cnt = 0;
+			common_element_start('ul', array('id' => 'messages'));
+		
+			while ($message->fetch() && $cnt <= MESSAGES_PER_PAGE) {
+				$cnt++;
+				
+				if ($cnt > MESSAGES_PER_PAGE) {
+					break;
+				}
+				
+				$this->show_message($message);
+			}
+
+			common_element_end('ul');
+			
+			common_pagination($page > 1, $cnt > MESSAGES_PER_PAGE,
+							  $page, $this->trimmed('action'),
+							  array('nickname' => $user->nickname));
+			
+			$message->free();
+			unset($message);
+		}
+	}
+
+	# returns the profile we want to show with the message
+	
+	function get_message_profile($message) {
+		return NULL;
+	}
+	
+	function show_message($message) {
+
+		common_element_start('li', array('class' => 'message_single',
+										  'id' => 'message-' . $message->id));
+
+		$profile = $this->get_message_profile($message);
+		
+		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+		common_element_start('a', array('href' => $profile->profileurl));
+		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+									'class' => 'avatar stream',
+									'width' => AVATAR_STREAM_SIZE,
+									'height' => AVATAR_STREAM_SIZE,
+									'alt' =>
+									($profile->fullname) ? $profile->fullname :
+									$profile->nickname));
+		common_element_end('a');
+		common_element('a', array('href' => $profile->profileurl,
+								  'class' => 'nickname'),
+					   $profile->nickname);
+		# FIXME: URL, image, video, audio
+		common_element_start('p', array('class' => 'content'));
+		common_raw($message->rendered);
+		common_element_end('p');
+		
+		$messageurl = common_local_url('showmessage', array('message' => $message->id));
+		
+		# XXX: we need to figure this out better. Is this right?
+		if (strcmp($message->uri, $messageurl) != 0 && preg_match('/^http/', $message->uri)) {
+			$messageurl = $message->uri;
+		}
+		common_element_start('p', 'time');
+		common_element('a', array('class' => 'permalink',
+								  'href' => $messageurl,
+								  'title' => common_exact_date($message->created)),
+					   common_date_string($message->created));
+		if ($message->source) {
+			common_text(_(' from '));
+			$this->source_link($message->source);
+		}
+		
+		common_element_end('p');
+		
+		common_element_end('li');
+	}
+}
diff --git a/_darcs/pristine/lib/noticelist.php b/_darcs/pristine/lib/noticelist.php
new file mode 100644
index 000000000..415c062e4
--- /dev/null
+++ b/_darcs/pristine/lib/noticelist.php
@@ -0,0 +1,224 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.	 If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class NoticeList {
+
+    var $notice = NULL;
+
+    function __construct($notice) {
+        $this->notice = $notice;
+    }
+
+    function show() {
+
+		common_element_start('ul', array('id' => 'notices'));
+
+		$cnt = 0;
+
+		while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
+			$cnt++;
+
+			if ($cnt > NOTICES_PER_PAGE) {
+				break;
+			}
+
+            $item = $this->new_list_item($this->notice);
+            $item->show();
+		}
+
+		common_element_end('ul');
+
+        return $cnt;
+	}
+
+    function new_list_item($notice) {
+        return new NoticeListItem($notice);
+    }
+}
+
+class NoticeListItem {
+
+    var $notice = NULL;
+    var $profile = NULL;
+
+    function __construct($notice) {
+        $this->notice = $notice;
+		$this->profile = $notice->getProfile();
+    }
+
+	function show() {
+        $this->show_start();
+        $this->show_fave_form();
+        $this->show_author();
+        $this->show_content();
+        $this->show_start_time_section();
+        $this->show_notice_link();
+        $this->show_notice_source();
+        $this->show_reply_to();
+        $this->show_reply_link();
+        $this->show_delete_link();
+        $this->show_end_time_section();
+        $this->show_end();
+	}
+
+    function show_start() {
+		# XXX: RDFa
+		common_element_start('li', array('class' => 'notice_single hentry',
+										  'id' => 'notice-' . $this->notice->id));
+    }
+
+    function show_fave_form() {
+        $user = common_current_user();
+		if ($user) {
+			if ($user->hasFave($this->notice)) {
+				common_disfavor_form($this->notice);
+			} else {
+				common_favor_form($this->notice);
+			}
+		}
+    }
+
+    function show_author() {
+ 		common_element_start('span', 'vcard author');
+        $this->show_avatar();
+        $this->show_nickname();
+		common_element_end('span');
+    }
+
+    function show_avatar() {
+		$avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
+		common_element_start('a', array('href' => $this->profile->profileurl));
+		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+									'class' => 'avatar stream photo',
+									'width' => AVATAR_STREAM_SIZE,
+									'height' => AVATAR_STREAM_SIZE,
+									'alt' =>
+									($this->profile->fullname) ? $this->profile->fullname :
+									$this->profile->nickname));
+		common_element_end('a');
+    }
+
+    function show_nickname() {
+		common_element('a', array('href' => $this->profile->profileurl,
+								  'class' => 'nickname fn url'),
+					   $this->profile->nickname);
+    }
+
+    function show_content() {
+		# FIXME: URL, image, video, audio
+		common_element_start('p', array('class' => 'content entry-title'));
+		if ($this->notice->rendered) {
+			common_raw($this->notice->rendered);
+		} else {
+			# XXX: may be some uncooked notices in the DB,
+			# we cook them right now. This should probably disappear in future
+			# versions (>> 0.4.x)
+			common_raw(common_render_content($this->notice->content, $this->notice));
+		}
+		common_element_end('p');
+    }
+
+    function show_start_time_section() {
+		common_element_start('p', 'time');
+    }
+
+    function show_notice_link() {
+		$noticeurl = common_local_url('shownotice', array('notice' => $this->notice->id));
+		# XXX: we need to figure this out better. Is this right?
+		if (strcmp($this->notice->uri, $noticeurl) != 0 && preg_match('/^http/', $this->notice->uri)) {
+			$noticeurl = $this->notice->uri;
+		}
+		common_element_start('a', array('class' => 'permalink',
+								  'rel' => 'bookmark',
+								  'href' => $noticeurl));
+		common_element('abbr', array('class' => 'published',
+									 'title' => common_date_iso8601($this->notice->created)),
+						common_date_string($this->notice->created));
+		common_element_end('a');
+    }
+
+    function show_notice_source() {
+		if ($this->notice->source) {
+			common_element('span', null, _(' from '));
+            $source_name = _($this->notice->source);
+            switch ($this->notice->source) {
+             case 'web':
+             case 'xmpp':
+             case 'mail':
+             case 'omb':
+             case 'api':
+                common_element('span', 'noticesource', $source_name);
+                break;
+             default:
+                $ns = Notice_source::staticGet($this->notice->source);
+                if ($ns) {
+                    common_element('a', array('href' => $ns->url),
+                                   $ns->name);
+                } else {
+                    common_element('span', 'noticesource', $source_name);
+                }
+                break;
+            }
+		}
+    }
+
+    function show_reply_to() {
+		if ($this->notice->reply_to) {
+			$replyurl = common_local_url('shownotice', array('notice' => $this->notice->reply_to));
+			common_text(' (');
+			common_element('a', array('class' => 'inreplyto',
+									  'href' => $replyurl),
+						   _('in reply to...'));
+			common_text(')');
+		}
+    }
+
+    function show_reply_link() {
+		common_element_start('a',
+							 array('href' => common_local_url('newnotice',
+															  array('replyto' => $this->profile->nickname)),
+								   'onclick' => 'return doreply("'.$this->profile->nickname.'", '.$this->notice->id.');',
+								   'title' => _('reply'),
+								   'class' => 'replybutton'));
+		common_raw(' &#8594;');
+		common_element_end('a');
+    }
+
+    function show_delete_link() {
+        $user = common_current_user();
+		if ($user && $this->notice->profile_id == $user->id) {
+			$deleteurl = common_local_url('deletenotice', array('notice' => $this->notice->id));
+			common_element_start('a', array('class' => 'deletenotice',
+											'href' => $deleteurl,
+											'title' => _('delete')));
+			common_raw(' &#215;');
+			common_element_end('a');
+		}
+    }
+
+    function show_end_time_section() {
+		common_element_end('p');
+    }
+
+    function show_end() {
+		common_element_end('li');
+    }
+}
diff --git a/_darcs/pristine/lib/oauthstore.php b/_darcs/pristine/lib/oauthstore.php
new file mode 100644
index 000000000..d7f9c9ff1
--- /dev/null
+++ b/_darcs/pristine/lib/oauthstore.php
@@ -0,0 +1,144 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/omb.php');
+
+class LaconicaOAuthDataStore extends OAuthDataStore {
+
+	# We keep a record of who's contacted us
+
+	function lookup_consumer($consumer_key) {
+		$con = Consumer::staticGet('consumer_key', $consumer_key);
+		if (!$con) {
+			$con = new Consumer();
+			$con->consumer_key = $consumer_key;
+			$con->seed = common_good_rand(16);
+			$con->created = DB_DataObject_Cast::dateTime();
+			if (!$con->insert()) {
+				return NULL;
+			}
+		}
+		return new OAuthConsumer($con->consumer_key, '');
+	}
+
+	function lookup_token($consumer, $token_type, $token_key) {
+		$t = new Token();
+		$t->consumer_key = $consumer->key;
+		$t->tok = $token_key;
+		$t->type = ($token_type == 'access') ? 1 : 0;
+		if ($t->find(true)) {
+			return new OAuthToken($t->tok, $t->secret);
+		} else {
+			return NULL;
+		}
+	}
+
+	function lookup_nonce($consumer, $token, $nonce, $timestamp) {
+		$n = new Nonce();
+		$n->consumer_key = $consumer->key;
+		$n->tok = $token->key;
+		$n->nonce = $nonce;
+		if ($n->find(TRUE)) {
+			return TRUE;
+		} else {
+			$n->timestamp = $timestamp;
+			$n->created = DB_DataObject_Cast::dateTime();
+			$n->insert();
+			return FALSE;
+		}
+	}
+
+	function new_request_token($consumer) {
+		$t = new Token();
+		$t->consumer_key = $consumer->key;
+		$t->tok = common_good_rand(16);
+		$t->secret = common_good_rand(16);
+		$t->type = 0; # request
+		$t->state = 0; # unauthorized
+		$t->created = DB_DataObject_Cast::dateTime();
+		if (!$t->insert()) {
+			return NULL;
+		} else {
+			return new OAuthToken($t->tok, $t->secret);
+		}
+	}
+
+	# defined in OAuthDataStore, but not implemented anywhere
+
+	function fetch_request_token($consumer) {
+		return $this->new_request_token($consumer);
+	}
+
+	function new_access_token($token, $consumer) {
+		common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__);
+		$rt = new Token();
+		$rt->consumer_key = $consumer->key;
+		$rt->tok = $token->key;
+		$rt->type = 0; # request
+		if ($rt->find(TRUE) && $rt->state == 1) { # authorized
+			common_debug('request token found.', __FILE__);
+			$at = new Token();
+			$at->consumer_key = $consumer->key;
+			$at->tok = common_good_rand(16);
+			$at->secret = common_good_rand(16);
+			$at->type = 1; # access
+			$at->created = DB_DataObject_Cast::dateTime();
+			if (!$at->insert()) {
+				$e = $at->_lastError;
+				common_debug('access token "'.$at->tok.'" not inserted: "'.$e->message.'"', __FILE__);
+				return NULL;
+			} else {
+				common_debug('access token "'.$at->tok.'" inserted', __FILE__);
+				# burn the old one
+				$orig_rt = clone($rt);
+				$rt->state = 2; # used
+				if (!$rt->update($orig_rt)) {
+					return NULL;
+				}
+				common_debug('request token "'.$rt->tok.'" updated', __FILE__);
+				# Update subscription
+				# XXX: mixing levels here
+				$sub = Subscription::staticGet('token', $rt->tok);
+				if (!$sub) {
+					return NULL;
+				}
+				common_debug('subscription for request token found', __FILE__);
+				$orig_sub = clone($sub);
+				$sub->token = $at->tok;
+				$sub->secret = $at->secret;
+				if (!$sub->update($orig_sub)) {
+					return NULL;
+				} else {
+					common_debug('subscription updated to use access token', __FILE__);
+					return new OAuthToken($at->tok, $at->secret);
+				}
+			}
+		} else {
+			return NULL;
+		}
+	}
+
+	# defined in OAuthDataStore, but not implemented anywhere
+
+	function fetch_access_token($consumer) {
+		return $this->new_access_token($consumer);
+	}
+}
diff --git a/_darcs/pristine/lib/omb.php b/_darcs/pristine/lib/omb.php
new file mode 100644
index 000000000..96736b4d4
--- /dev/null
+++ b/_darcs/pristine/lib/omb.php
@@ -0,0 +1,299 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once('OAuth.php');
+require_once(INSTALLDIR.'/lib/oauthstore.php');
+
+require_once(INSTALLDIR.'/classes/Consumer.php');
+require_once(INSTALLDIR.'/classes/Nonce.php');
+require_once(INSTALLDIR.'/classes/Token.php');
+
+require_once('Auth/Yadis/Yadis.php');
+
+define('OAUTH_NAMESPACE', 'http://oauth.net/core/1.0/');
+define('OMB_NAMESPACE', 'http://openmicroblogging.org/protocol/0.1');
+define('OMB_VERSION_01', 'http://openmicroblogging.org/protocol/0.1');
+define('OAUTH_DISCOVERY', 'http://oauth.net/discovery/1.0');
+
+define('OMB_ENDPOINT_UPDATEPROFILE', OMB_NAMESPACE.'/updateProfile');
+define('OMB_ENDPOINT_POSTNOTICE', OMB_NAMESPACE.'/postNotice');
+define('OAUTH_ENDPOINT_REQUEST', OAUTH_NAMESPACE.'endpoint/request');
+define('OAUTH_ENDPOINT_AUTHORIZE', OAUTH_NAMESPACE.'endpoint/authorize');
+define('OAUTH_ENDPOINT_ACCESS', OAUTH_NAMESPACE.'endpoint/access');
+define('OAUTH_ENDPOINT_RESOURCE', OAUTH_NAMESPACE.'endpoint/resource');
+define('OAUTH_AUTH_HEADER', OAUTH_NAMESPACE.'parameters/auth-header');
+define('OAUTH_POST_BODY', OAUTH_NAMESPACE.'parameters/post-body');
+define('OAUTH_HMAC_SHA1', OAUTH_NAMESPACE.'signature/HMAC-SHA1');
+
+function omb_oauth_consumer() {
+	static $con = NULL;
+	if (!$con) {
+		$con = new OAuthConsumer(common_root_url(), '');
+	}
+	return $con;
+}
+
+function omb_oauth_server() {
+	static $server = null;
+	if (!$server) {
+		$server = new OAuthServer(omb_oauth_datastore());
+		$server->add_signature_method(omb_hmac_sha1());
+	}
+	return $server;
+}
+
+function omb_oauth_datastore() {
+	static $store = NULL;
+	if (!$store) {
+		$store = new LaconicaOAuthDataStore();
+	}
+	return $store;
+}
+
+function omb_hmac_sha1() {
+	static $hmac_method = NULL;
+	if (!$hmac_method) {
+		$hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
+	}
+	return $hmac_method;
+}
+
+function omb_get_services($xrd, $type) {
+	return $xrd->services(array(omb_service_filter($type)));
+}
+
+function omb_service_filter($type) {
+	return create_function('$s',
+						   'return omb_match_service($s, \''.$type.'\');');
+}
+
+function omb_match_service($service, $type) {
+	return in_array($type, $service->getTypes());
+}
+
+function omb_service_uri($service) {
+	if (!$service) {
+		return NULL;
+	}
+	$uris = $service->getURIs();
+	if (!$uris) {
+		return NULL;
+	}
+	return $uris[0];
+}
+
+function omb_local_id($service) {
+	if (!$service) {
+		return NULL;
+	}
+	$els = $service->getElements('xrd:LocalID');
+	if (!$els) {
+		return NULL;
+	}
+	$el = $els[0];
+	return $service->parser->content($el);
+}
+
+function omb_broadcast_remote_subscribers($notice) {
+
+	# First, get remote users subscribed to this profile
+	$rp = new Remote_profile();
+
+	$rp->query('SELECT postnoticeurl, token, secret ' .
+			   'FROM subscription JOIN remote_profile ' .
+			   'ON subscription.subscriber = remote_profile.id ' .
+			   'WHERE subscription.subscribed = ' . $notice->profile_id . ' ');
+
+	$posted = array();
+
+	while ($rp->fetch()) {
+		if (!$posted[$rp->postnoticeurl]) {
+			common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
+			if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
+				common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
+				$posted[$rp->postnoticeurl] = TRUE;
+			} else {
+				common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl);
+			}
+		}
+	}
+
+	$rp->free();
+	unset($rp);
+
+	return true;
+}
+
+function omb_post_notice($notice, $remote_profile, $subscription) {
+	return omb_post_notice_keys($notice, $remote_profile->postnoticeurl, $subscription->token, $subscription->secret);
+}
+
+function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
+
+	common_debug('Posting notice ' . $notice->id . ' to ' . $postnoticeurl, __FILE__);
+
+	$user = User::staticGet('id', $notice->profile_id);
+
+	if (!$user) {
+		common_debug('Failed to get user for notice ' . $notice->id . ', profile = ' . $notice->profile_id, __FILE__);
+		return false;
+	}
+
+	$con = omb_oauth_consumer();
+
+	$token = new OAuthToken($tk, $secret);
+
+	$url = $postnoticeurl;
+	$parsed = parse_url($url);
+	$params = array();
+	parse_str($parsed['query'], $params);
+
+	$req = OAuthRequest::from_consumer_and_token($con, $token,
+												 'POST', $url, $params);
+
+	$req->set_parameter('omb_version', OMB_VERSION_01);
+	$req->set_parameter('omb_listenee', $user->uri);
+	$req->set_parameter('omb_notice', $notice->uri);
+	$req->set_parameter('omb_notice_content', $notice->content);
+	$req->set_parameter('omb_notice_url', common_local_url('shownotice',
+														   array('notice' =>
+																 $notice->id)));
+	$req->set_parameter('omb_notice_license', common_config('license', 'url'));
+
+	$user->free();
+	unset($user);
+
+	$req->sign_request(omb_hmac_sha1(), $con, $token);
+
+	# We re-use this tool's fetcher, since it's pretty good
+
+	$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+
+	if (!$fetcher) {
+		common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
+		return false;
+	}
+
+	$result = $fetcher->post($req->get_normalized_http_url(),
+							 $req->to_postdata(),
+                             array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
+
+	common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
+
+	if ($result->status == 403) { # not authorized, don't send again
+		common_debug('403 result, deleting subscription', __FILE__);
+		# FIXME: figure out how to delete this
+		# $subscription->delete();
+		return false;
+	} else if ($result->status != 200) {
+		common_debug('Error status '.$result->status, __FILE__);
+		return false;
+	} else { # success!
+		parse_str($result->body, $return);
+		if ($return['omb_version'] == OMB_VERSION_01) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+}
+
+function omb_broadcast_profile($profile) {
+	# First, get remote users subscribed to this profile
+	# XXX: use a join here rather than looping through results
+	$sub = new Subscription();
+	$sub->subscribed = $profile->id;
+	if ($sub->find()) {
+		$updated = array();
+		while ($sub->fetch()) {
+			$rp = Remote_profile::staticGet('id', $sub->subscriber);
+			if ($rp) {
+				if (!$updated[$rp->updateprofileurl]) {
+					if (omb_update_profile($profile, $rp, $sub)) {
+						$updated[$rp->updateprofileurl] = TRUE;
+					}
+				}
+			}
+		}
+	}
+}
+
+function omb_update_profile($profile, $remote_profile, $subscription) {
+	global $config; # for license URL
+	$user = User::staticGet($profile->id);
+	$con = omb_oauth_consumer();
+	$token = new OAuthToken($subscription->token, $subscription->secret);
+	$url = $remote_profile->updateprofileurl;
+	$parsed = parse_url($url);
+	$params = array();
+	parse_str($parsed['query'], $params);
+	$req = OAuthRequest::from_consumer_and_token($con, $token,
+												 "POST", $url, $params);
+	$req->set_parameter('omb_version', OMB_VERSION_01);
+	$req->set_parameter('omb_listenee', $user->uri);
+	$req->set_parameter('omb_listenee_profile', common_profile_url($profile->nickname));
+	$req->set_parameter('omb_listenee_nickname', $profile->nickname);
+
+	# We use blanks to force emptying any existing values in these optional fields
+
+	$req->set_parameter('omb_listenee_fullname',
+						($profile->fullname) ? $profile->fullname : '');
+	$req->set_parameter('omb_listenee_homepage',
+						($profile->homepage) ? $profile->homepage : '');
+	$req->set_parameter('omb_listenee_bio',
+						($profile->bio) ? $profile->bio : '');
+	$req->set_parameter('omb_listenee_location',
+						($profile->location) ? $profile->location : '');
+
+	$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+	$req->set_parameter('omb_listenee_avatar',
+						($avatar) ? $avatar->url : '');
+
+	$req->sign_request(omb_hmac_sha1(), $con, $token);
+
+	# We re-use this tool's fetcher, since it's pretty good
+
+	$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+
+	common_debug('request URL = '.$req->get_normalized_http_url(), __FILE__);
+	common_debug('postdata = '.$req->to_postdata(), __FILE__);
+	$result = $fetcher->post($req->get_normalized_http_url(),
+							 $req->to_postdata(),
+                             array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
+
+	common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
+
+	if ($result->status == 403) { # not authorized, don't send again
+		common_debug('403 result, deleting subscription', __FILE__);
+		$subscription->delete();
+		return false;
+	} else if ($result->status != 200) {
+		common_debug('Error status '.$result->status, __FILE__);
+		return false;
+	} else { # success!
+		parse_str($result->body, $return);
+		if ($return['omb_version'] == OMB_VERSION_01) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/_darcs/pristine/lib/openid.php b/_darcs/pristine/lib/openid.php
new file mode 100644
index 000000000..6e501c2b1
--- /dev/null
+++ b/_darcs/pristine/lib/openid.php
@@ -0,0 +1,242 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/classes/User_openid.php');
+
+require_once('Auth/OpenID.php');
+require_once('Auth/OpenID/Consumer.php');
+require_once('Auth/OpenID/SReg.php');
+require_once('Auth/OpenID/MySQLStore.php');
+
+# About one year cookie expiry
+
+define('OPENID_COOKIE_EXPIRY', round(365.25 * 24 * 60 * 60));
+define('OPENID_COOKIE_KEY', 'lastusedopenid');
+
+function oid_store() {
+    static $store = NULL;
+	if (!$store) {
+		# Can't be called statically
+		$user = new User();
+		$conn = $user->getDatabaseConnection();
+		$store = new Auth_OpenID_MySQLStore($conn);
+	}
+	return $store;
+}
+
+function oid_consumer() {
+	$store = oid_store();
+	$consumer = new Auth_OpenID_Consumer($store);
+	return $consumer;
+}
+
+function oid_clear_last() {
+	oid_set_last('');
+}
+
+function oid_set_last($openid_url) {
+	common_set_cookie(OPENID_COOKIE_KEY,
+			         $openid_url,
+			         time() + OPENID_COOKIE_EXPIRY);
+}
+
+function oid_get_last() {
+	$openid_url = $_COOKIE[OPENID_COOKIE_KEY];
+	if ($openid_url && strlen($openid_url) > 0) {
+		return $openid_url;
+	} else {
+		return NULL;
+	}
+}
+
+function oid_link_user($id, $canonical, $display) {
+
+	$oid = new User_openid();
+	$oid->user_id = $id;
+	$oid->canonical = $canonical;
+	$oid->display = $display;
+	$oid->created = DB_DataObject_Cast::dateTime();
+
+	if (!$oid->insert()) {
+		$err = PEAR::getStaticProperty('DB_DataObject','lastError');
+		common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
+		return false;
+	}
+
+	return true;
+}
+
+function oid_get_user($openid_url) {
+	$user = NULL;
+	$oid = User_openid::staticGet('canonical', $openid_url);
+	if ($oid) {
+		$user = User::staticGet('id', $oid->user_id);
+	}
+	return $user;
+}
+
+function oid_check_immediate($openid_url, $backto=NULL) {
+	if (!$backto) {
+		$action = $_REQUEST['action'];
+		$args = common_copy_args($_GET);
+		unset($args['action']);
+		$backto = common_local_url($action, $args);
+	}
+	common_debug('going back to "' . $backto . '"', __FILE__);
+
+	common_ensure_session();
+
+	$_SESSION['openid_immediate_backto'] = $backto;
+	common_debug('passed-in variable is "' . $backto . '"', __FILE__);
+	common_debug('session variable is "' . $_SESSION['openid_immediate_backto'] . '"', __FILE__);
+
+	oid_authenticate($openid_url,
+					 'finishimmediate',
+					 true);
+}
+
+function oid_authenticate($openid_url, $returnto, $immediate=false) {
+
+	$consumer = oid_consumer();
+
+	if (!$consumer) {
+		common_server_error(_('Cannot instantiate OpenID consumer object.'));
+		return false;
+	}
+
+	common_ensure_session();
+
+	$auth_request = $consumer->begin($openid_url);
+
+	// Handle failure status return values.
+	if (!$auth_request) {
+		return _('Not a valid OpenID.');
+	} else if (Auth_OpenID::isFailure($auth_request)) {
+		return sprintf(_('OpenID failure: %s'), $auth_request->message);
+	}
+
+	$sreg_request = Auth_OpenID_SRegRequest::build(// Required
+												   array(),
+												   // Optional
+												   array('nickname',
+														 'email',
+														 'fullname',
+														 'language',
+														 'timezone',
+														 'postcode',
+														 'country'));
+
+	if ($sreg_request) {
+		$auth_request->addExtension($sreg_request);
+	}
+
+	$trust_root = common_local_url('public');
+	$process_url = common_local_url($returnto);
+
+	if ($auth_request->shouldSendRedirect()) {
+		$redirect_url = $auth_request->redirectURL($trust_root,
+												   $process_url,
+												   $immediate);
+		if (!$redirect_url) {
+		} else if (Auth_OpenID::isFailure($redirect_url)) {
+			return sprintf(_('Could not redirect to server: %s'), $redirect_url->message);
+		} else {
+			common_redirect($redirect_url);
+		}
+	} else {
+		// Generate form markup and render it.
+		$form_id = 'openid_message';
+		$form_html = $auth_request->formMarkup($trust_root, $process_url,
+											   $immediate, array('id' => $form_id));
+
+		# XXX: This is cheap, but things choke if we don't escape ampersands
+		# in the HTML attributes
+
+		$form_html = preg_replace('/&/', '&amp;', $form_html);
+
+		// Display an error if the form markup couldn't be generated;
+		// otherwise, render the HTML.
+		if (Auth_OpenID::isFailure($form_html)) {
+			$this->show_form(sprintf(_('Could not create OpenID form: %s'), $form_html->message));
+		} else {
+			common_show_header(_('OpenID Auto-Submit'), NULL, NULL, '_oid_print_instructions');
+			common_raw($form_html);
+			common_element('script', NULL,
+						   '$(document).ready(function() { ' .
+						   '    $("#'. $form_id .'").submit(); '.
+						   '});');
+			common_show_footer();
+		}
+	}
+}
+
+# Half-assed attempt at a module-private function
+
+function _oid_print_instructions() {
+	common_element('div', 'instructions',
+				   _('This form should automatically submit itself. '.
+					  'If not, click the submit button to go to your '.
+					  'OpenID provider.'));
+}
+
+# update a user from sreg parameters
+
+function oid_update_user(&$user, &$sreg) {
+
+	$profile = $user->getProfile();
+
+	$orig_profile = clone($profile);
+
+	if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
+		$profile->fullname = $sreg['fullname'];
+	}
+
+	if ($sreg['country']) {
+		if ($sreg['postcode']) {
+			# XXX: use postcode to get city and region
+			# XXX: also, store postcode somewhere -- it's valuable!
+			$profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
+		} else {
+			$profile->location = $sreg['country'];
+		}
+	}
+
+	# XXX save language if it's passed
+	# XXX save timezone if it's passed
+
+	if (!$profile->update($orig_profile)) {
+		common_server_error(_('Error saving the profile.'));
+		return false;
+	}
+
+	$orig_user = clone($user);
+
+	if ($sreg['email'] && Validate::email($sreg['email'], true)) {
+		$user->email = $sreg['email'];
+	}
+
+	if (!$user->update($orig_user)) {
+		common_server_error(_('Error saving the user.'));
+		return false;
+	}
+
+	return true;
+}
diff --git a/_darcs/pristine/lib/personal.php b/_darcs/pristine/lib/personal.php
new file mode 100644
index 000000000..86433b486
--- /dev/null
+++ b/_darcs/pristine/lib/personal.php
@@ -0,0 +1,206 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class PersonalAction extends Action {
+	
+	function is_readonly() {
+		return true;
+	}
+	
+	function handle($args) {
+		parent::handle($args);
+	    common_set_returnto($this->self_url());
+	}
+
+	function views_menu() {
+
+		$user = NULL;
+		$action = $this->trimmed('action');
+		$nickname = $this->trimmed('nickname');
+
+		if ($nickname) {
+			$user = User::staticGet('nickname', $nickname);
+			$user_profile = $user->getProfile();
+		} else {
+			$user_profile = false;
+		}
+
+		common_element_start('ul', array('id' => 'nav_views'));
+
+		common_menu_item(common_local_url('all', array('nickname' =>
+													   $nickname)),
+						 _('Personal'),
+						 sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+						 $action == 'all');
+		common_menu_item(common_local_url('replies', array('nickname' =>
+															  $nickname)),
+						 _('Replies'),
+						 sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+						 $action == 'replies');
+		common_menu_item(common_local_url('showstream', array('nickname' =>
+															  $nickname)),
+						 _('Profile'),
+						 ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
+						 $action == 'showstream');
+		common_menu_item(common_local_url('showfavorites', array('nickname' =>
+															  $nickname)),
+						 _('Favorites'),
+						 sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
+						 $action == 'showfavorites');
+		
+		$cur = common_current_user();
+		
+		if ($cur && $cur->id == $user->id) {
+			
+			common_menu_item(common_local_url('inbox', array('nickname' =>
+																	 $nickname)),
+							 _('Inbox'),
+							 _('Your incoming messages'),
+							 $action == 'inbox');
+			common_menu_item(common_local_url('outbox', array('nickname' =>
+																	 $nickname)),
+							 _('Outbox'),
+							 _('Your sent messages'),
+							 $action == 'outbox');
+		}
+		
+		common_element_end('ul');
+	}
+
+	function show_feeds_list($feeds) {
+		common_element_start('div', array('class' => 'feeds'));
+		common_element('p', null, 'Feeds:');
+		common_element_start('ul', array('class' => 'xoxo'));
+
+		foreach ($feeds as $key => $value) {
+			$this->common_feed_item($feeds[$key]);
+		}
+		common_element_end('ul');
+		common_element_end('div');
+	}
+
+	function common_feed_item($feed) {
+		$nickname = $this->trimmed('nickname');
+
+		switch($feed['item']) {
+			case 'notices': default:
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "$nickname's ".$feed['version']." notice feed";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'allrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = $feed['version']." feed for $nickname and friends";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'repliesrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = $feed['version']." feed for replies to $nickname";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'publicrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "Public timeline ".$feed['version']." feed";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'publicatom':
+				$feed_classname = "atom";
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "Public timeline ".$feed['version']." feed";
+				$feed['textContent'] = "Atom";
+				break;
+
+			case 'tagrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = $feed['version']." feed for this tag";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'favoritedrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "Favorited ".$feed['version']." feed";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'foaf':
+				$feed_classname = "foaf";
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "$nickname's FOAF file";
+				$feed['textContent'] = "FOAF";
+				break;
+
+			case 'favoritesrss':
+				$feed_classname = "favorites";
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "Feed for favorites of $nickname";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'usertimeline':
+				$feed_classname = "atom";
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "$nickname's ".$feed['version']." notice feed";
+				$feed['textContent'] = "Atom";
+				break;
+		}
+		common_element_start('li');
+		common_element('a', array('href' => $feed['href'],
+								  'class' => $feed_classname,
+								  'type' => $feed_mimetype,
+								  'title' => $feed_title),
+							$feed['textContent']);
+		common_element_end('li');
+	}
+
+	
+	function source_link($source) {
+		$source_name = _($source);
+		switch ($source) {
+		 case 'web':
+		 case 'xmpp':
+		 case 'mail':
+		 case 'omb':
+		 case 'api':
+			common_element('span', 'noticesource', $source_name);
+			break;
+		 default:
+			$ns = Notice_source::staticGet($source);
+			if ($ns) {
+				common_element('a', array('href' => $ns->url),
+							   $ns->name);
+			} else {
+				common_element('span', 'noticesource', $source_name);
+			}
+			break;
+		}
+		return;
+	}
+}
diff --git a/_darcs/pristine/lib/profilelist.php b/_darcs/pristine/lib/profilelist.php
new file mode 100644
index 000000000..9079ea9d7
--- /dev/null
+++ b/_darcs/pristine/lib/profilelist.php
@@ -0,0 +1,169 @@
+<?php
+
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+define('PROFILES_PER_PAGE', 20);
+
+class ProfileList {
+
+	var $profile = NULL;
+	var $owner = NULL;
+	var $action = NULL;
+
+	function __construct($profile, $owner=NULL, $action=NULL) {
+		$this->profile = $profile;
+		$this->owner = $owner;
+		$this->action = $action;
+	}
+
+	function show_list() {
+
+		common_element_start('ul', array('id' => 'profiles', 'class' => 'profile_list'));
+
+		$cnt = 0;
+
+		while ($this->profile->fetch()) {
+			$cnt++;
+			if($cnt > PROFILES_PER_PAGE) {
+				break;
+			}
+			$this->show();
+		}
+
+		common_element_end('ul');
+
+		return $cnt;
+	}
+
+	function show() {
+
+		common_element_start('li', array('class' => 'profile_single',
+										 'id' => 'profile-' . $this->profile->id));
+
+		$user = common_current_user();
+
+		if ($user && $user->id != $this->profile->id) {
+			# XXX: special-case for user looking at own
+			# subscriptions page
+			if ($user->isSubscribed($this->profile)) {
+				common_unsubscribe_form($this->profile);
+			} else {
+				common_subscribe_form($this->profile);
+			}
+		}
+
+		$avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
+		common_element_start('a', array('href' => $this->profile->profileurl));
+		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+									'class' => 'avatar stream',
+									'width' => AVATAR_STREAM_SIZE,
+									'height' => AVATAR_STREAM_SIZE,
+									'alt' =>
+									($this->profile->fullname) ? $this->profile->fullname :
+									$this->profile->nickname));
+		common_element_end('a');
+		common_element_start('p');
+		common_element_start('a', array('href' => $this->profile->profileurl,
+										'class' => 'nickname'));
+		common_raw($this->highlight($this->profile->nickname));
+		common_element_end('a');
+		if ($this->profile->fullname) {
+			common_text(' | ');
+			common_element_start('span', 'fullname');
+			common_raw($this->highlight($this->profile->fullname));
+			common_element_end('span');
+		}
+		if ($this->profile->location) {
+			common_text(' | ');
+			common_element_start('span', 'location');
+			common_raw($this->highlight($this->profile->location));
+			common_element_end('span');
+		}
+		common_element_end('p');
+		if ($this->profile->homepage) {
+			common_element_start('p', 'website');
+			common_element_start('a', array('href' => $this->profile->homepage));
+			common_raw($this->highlight($this->profile->homepage));
+			common_element_end('a');
+			common_element_end('p');
+		}
+		if ($this->profile->bio) {
+			common_element_start('p', 'bio');
+			common_raw($this->highlight($this->profile->bio));
+			common_element_end('p');
+		}
+
+		# If we're on a list with an owner (subscriptions or subscribers)...
+
+		if ($this->owner) {
+			# Get tags
+			$tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
+
+			common_element_start('div', 'tags_user');
+			common_element_start('dl');
+			common_element_start('dt');
+			if ($user->id == $this->owner->id) {
+				common_element('a', array('href' => common_local_url('tagother',
+																	 array('id' => $this->profile->id))),
+							   _('Tags'));
+			} else {
+				common_text(_('Tags'));
+			}
+			common_text(":");
+			common_element_end('dt');
+			common_element_start('dd');
+			if ($tags) {
+				common_element_start('ul', 'tags xoxo');
+				foreach ($tags as $tag) {
+					common_element_start('li');
+					common_element('a', array('rel' => 'tag',
+											  'href' => common_local_url($this->action,
+																		 array('nickname' => $this->owner->nickname,
+																			   'tag' => $tag))),
+								   $tag);
+					common_element_end('li');
+				}
+				common_element_end('ul');
+			} else {
+				common_text(_('(none)'));
+			}
+			common_element_end('dd');
+			common_element_end('dl');
+			common_element_end('div');
+		}
+
+        if ($user && $user->id == $this->owner->id) {
+            $this->show_owner_controls($this->profile);
+        }
+
+		common_element_end('li');
+	}
+
+    /* Override this in subclasses. */
+
+    function show_owner_controls($profile) {
+        return;
+    }
+
+	function highlight($text) {
+		return htmlspecialchars($text);
+	}
+}
\ No newline at end of file
diff --git a/_darcs/pristine/lib/queuehandler.php b/_darcs/pristine/lib/queuehandler.php
new file mode 100644
index 000000000..23f295c45
--- /dev/null
+++ b/_darcs/pristine/lib/queuehandler.php
@@ -0,0 +1,132 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('CLAIM_TIMEOUT', 1200);
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/daemon.php');
+require_once(INSTALLDIR.'/classes/Queue_item.php');
+require_once(INSTALLDIR.'/classes/Notice.php');
+
+class QueueHandler extends Daemon {
+
+	var $_id = 'generic';
+
+	function QueueHandler($id=NULL) {
+		if ($id) {
+			$this->set_id($id);
+		}
+	}
+	
+	function class_name() {
+		return ucfirst($this->transport()) . 'Handler';
+	}
+
+	function name() {
+		return strtolower($this->class_name().'.'.$this->get_id());
+	}
+	
+	function get_id() {
+		return $this->_id;
+	}
+
+	function set_id($id) {
+		$this->_id = $id;
+	}
+	
+	function transport() {
+		return NULL;
+	}
+	
+	function start() {
+	}
+	
+	function finish() {
+	}
+
+	function handle_notice($notice) {
+		return true;
+	}
+	
+	function run() {
+		if (!$this->start()) {
+			return false;
+		}
+		$this->log(LOG_INFO, 'checking for queued notices');
+		$transport = $this->transport();
+		do {
+			$qi = Queue_item::top($transport);
+			if ($qi) {
+				$this->log(LOG_INFO, 'Got item enqueued '.common_exact_date($qi->created));
+				$notice = Notice::staticGet($qi->notice_id);
+				if ($notice) {
+					$this->log(LOG_INFO, 'broadcasting notice ID = ' . $notice->id);
+					# XXX: what to do if broadcast fails?
+					$result = $this->handle_notice($notice);
+					if (!$result) {
+						$this->log(LOG_WARNING, 'Failed broadcast for notice ID = ' . $notice->id);
+						$orig = $qi;
+						$qi->claimed = NULL;
+						$qi->update($orig);
+						$this->log(LOG_WARNING, 'Abandoned claim for notice ID = ' . $notice->id);
+						continue;
+					}
+					$this->log(LOG_INFO, 'finished broadcasting notice ID = ' . $notice->id);
+					$notice->free();
+					unset($notice);
+					$notice = NULL;
+				} else {
+					$this->log(LOG_WARNING, 'queue item for notice that does not exist');
+				}
+				$qi->delete();
+				$qi->free();
+				unset($qi);
+				$this->idle(0);
+			} else {
+				$this->clear_old_claims();
+				$this->idle(5);
+			}	
+		} while (true);
+		if (!$this->finish()) {
+			return false;
+		}
+		return true;
+	}
+
+	function idle($timeout=0) {
+		if ($timeout>0) {
+			sleep($timeout);
+		}
+	}
+	
+	function clear_old_claims() {
+		$qi = new Queue_item();
+		$qi->transport = $this->transport();
+		$qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
+		$qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
+		$qi->free();
+		unset($qi);
+	}
+	
+	function log($level, $msg) {
+		common_log($level, $this->class_name() . ' ('. $this->get_id() .'): '.$msg);
+	}
+}
+	
\ No newline at end of file
diff --git a/_darcs/pristine/lib/rssaction.php b/_darcs/pristine/lib/rssaction.php
new file mode 100644
index 000000000..777511506
--- /dev/null
+++ b/_darcs/pristine/lib/rssaction.php
@@ -0,0 +1,189 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+define('DEFAULT_RSS_LIMIT', 48);
+
+class Rss10Action extends Action {
+
+	# This will contain the details of each feed item's author and be used to generate SIOC data.
+	var $creators = array();
+
+	function is_readonly() {
+		return true;
+	}
+
+	function handle($args) {
+		parent::handle($args);
+		$limit = (int) $this->trimmed('limit');
+		if ($limit == 0) {
+			$limit = DEFAULT_RSS_LIMIT;
+		}
+		$this->show_rss($limit);
+	}
+
+	function init() {
+		return true;
+	}
+
+	function get_notices() {
+		return array();
+	}
+
+	function get_channel() {
+		return array('url' => '',
+					 'title' => '',
+					 'link' => '',
+					 'description' => '');
+	}
+
+	function get_image() {
+		return NULL;
+	}
+
+	function show_rss($limit=0) {
+
+		if (!$this->init()) {
+			return;
+		}
+
+		$notices = $this->get_notices($limit);
+
+		$this->init_rss();
+		$this->show_channel($notices);
+		$this->show_image();
+
+		foreach ($notices as $n) {
+			$this->show_item($n);
+		}
+
+		$this->show_creators();
+		$this->end_rss();
+	}
+
+	function show_channel($notices) {
+
+		$channel = $this->get_channel();
+		$image = $this->get_image();
+
+		common_element_start('channel', array('rdf:about' => $channel['url']));
+		common_element('title', NULL, $channel['title']);
+		common_element('link', NULL, $channel['link']);
+		common_element('description', NULL, $channel['description']);
+		common_element('cc:licence', array('rdf:resource' => common_config('license','url')));
+
+		if ($image) {
+			common_element('image', array('rdf:resource' => $image));
+		}
+
+		common_element_start('items');
+		common_element_start('rdf:Seq');
+
+		foreach ($notices as $notice) {
+			common_element('sioct:MicroblogPost', array('rdf:resource' => $notice->uri));
+		}
+
+		common_element_end('rdf:Seq');
+		common_element_end('items');
+
+		common_element_end('channel');
+	}
+
+	function show_image() {
+		$image = $this->get_image();
+		if ($image) {
+			$channel = $this->get_channel();
+			common_element_start('image', array('rdf:about' => $image));
+			common_element('title', NULL, $channel['title']);
+			common_element('link', NULL, $channel['link']);
+			common_element('url', NULL, $image);
+			common_element_end('image');
+		}
+	}
+
+	function show_item($notice) {
+		$profile = Profile::staticGet($notice->profile_id);
+		$nurl = common_local_url('shownotice', array('notice' => $notice->id));
+		$creator_uri = common_profile_uri($profile);
+		common_element_start('item', array('rdf:about' => $notice->uri));
+		$title = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
+		common_element('title', NULL, $title);
+		common_element('link', NULL, $nurl);
+		common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created));
+		common_element('dc:date', NULL, common_date_w3dtf($notice->created));
+		common_element('dc:creator', NULL, ($profile->fullname) ? $profile->fullname : $profile->nickname);
+		common_element('sioc:has_creator', array('rdf:resource' => $creator_uri));
+		common_element('laconica:postIcon', array('rdf:resource' => common_profile_avatar_url($profile)));
+		common_element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
+		common_element_end('item');
+		$this->creators[$creator_uri] = $profile;
+	}
+
+	function show_creators() {
+		foreach ($this->creators as $uri => $profile) {
+			$id = $profile->id;
+			$nickname = $profile->nickname;
+			common_element_start('sioc:User', array('rdf:about' => $uri));
+			common_element('foaf:nick', NULL, $nickname);
+			if ($profile->fullname) {
+				common_element('foaf:name', NULL, $profile->fullname);
+			}
+			common_element('sioc:id', NULL, $id);
+			$avatar = common_profile_avatar_url($profile);
+			common_element('sioc:avatar', array('rdf:resource' => $avatar));
+			common_element_end('sioc:User');
+		}
+	}
+
+	function init_rss() {
+		$channel = $this->get_channel();
+		header('Content-Type: application/rdf+xml');
+
+		common_start_xml();
+		common_element_start('rdf:RDF', array('xmlns:rdf' =>
+											  'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+											  'xmlns:dc' =>
+											  'http://purl.org/dc/elements/1.1/',
+											  'xmlns:cc' =>
+											  'http://web.resource.org/cc/',
+                                              'xmlns:content' =>
+                                              'http://purl.org/rss/1.0/modules/content/',
+											  'xmlns:foaf' =>
+											  'http://xmlns.com/foaf/0.1/',
+											  'xmlns:sioc' =>
+											  'http://rdfs.org/sioc/ns#',
+		                                      'xmlns:sioct' =>
+		                                      'http://rdfs.org/sioc/types#',
+		                                      'xmlns:laconica' =>
+		                                      'http://laconi.ca/ont/',
+											  'xmlns' => 'http://purl.org/rss/1.0/'));
+		common_element_start('sioc:Site', array('rdf:about' => common_root_url()));
+		common_element('sioc:name', NULL, common_config('site', 'name'));
+		common_element_start('sioc:container_of');
+		common_element('sioc:Container', array('rdf:about' =>
+		                                       $channel['url']));
+		common_element_end('sioc:container_of');
+		common_element_end('sioc:Site');
+	}
+
+	function end_rss() {
+		common_element_end('rdf:RDF');
+	}
+}
diff --git a/_darcs/pristine/lib/search_engines.php b/_darcs/pristine/lib/search_engines.php
new file mode 100644
index 000000000..7fcc1ffcb
--- /dev/null
+++ b/_darcs/pristine/lib/search_engines.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class SearchEngine {
+    protected $target;
+    protected $table;
+
+    function __construct($target, $table) {
+        $this->target = $target;
+        $this->table = $table;
+    }
+
+    function query($q) {
+    }
+
+    function limit($offset, $count, $rss = false) {
+        return $this->target->limit($offset, $count);
+    }
+
+    function set_sort_mode($mode) {
+        if ('chron' === $mode)
+            return $this->target->orderBy('created desc');
+    }
+}
+
+class SphinxSearch extends SearchEngine {
+    private $sphinx;
+    private $connected;
+
+    function __construct($target, $table) {
+        $fp = @fsockopen(common_config('sphinx', 'server'), common_config('sphinx', 'port'));
+        if (!$fp) {
+            $this->connected = false;
+            return;
+        }
+        fclose($fp);
+        parent::__construct($target, $table);
+        $this->sphinx = new SphinxClient;
+        $this->sphinx->setServer(common_config('sphinx', 'server'), common_config('sphinx', 'port'));
+        $this->connected = true;
+    }
+
+    function is_connected() {
+        return $this->connected;
+    }
+
+    function limit($offset, $count, $rss = false) {
+        //FIXME without LARGEST_POSSIBLE, the most recent results aren't returned
+        //      this probably has a large impact on performance
+        $LARGEST_POSSIBLE = 1e6; 
+
+        if ($rss) {
+            $this->sphinx->setLimits($offset, $count, $count, $LARGEST_POSSIBLE);
+        }
+        else {
+            // return at most 50 pages of results
+            $this->sphinx->setLimits($offset, $count, 50 * ($count - 1), $LARGEST_POSSIBLE);
+        }
+
+        return $this->target->limit(0, $count);
+    }
+
+    function query($q) {
+        $result = $this->sphinx->query($q, $this->table);
+        if (!isset($result['matches'])) return false;
+        $id_set = join(', ', array_keys($result['matches']));
+        $this->target->whereAdd("id in ($id_set)");
+        return true;
+     }
+
+    function set_sort_mode($mode) {
+        if ('chron' === $mode) {
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
+            return $this->target->orderBy('created desc');
+        }
+    }
+}
+
+class MySQLSearch extends SearchEngine {
+    function query($q) {
+        if ('identica_people' === $this->table)
+            return $this->target->whereAdd('MATCH(nickname, fullname, location, bio, homepage) ' .
+						   'against (\''.addslashes($q).'\')');
+        if ('identica_notices' === $this->table)
+            return $this->target->whereAdd('MATCH(content) ' .
+						   'against (\''.addslashes($q).'\')');
+    }
+}
+
+class PGSearch extends SearchEngine {
+    function query($q) {
+        if ('identica_people' === $this->table)
+            return $this->target->whereAdd('textsearch @@ plainto_tsquery(\''.addslashes($q).'\')');
+        if ('identica_notices' === $this->table)
+            return $this->target->whereAdd('to_tsvector(\'english\', content) @@ plainto_tsquery(\''.addslashes($q).'\')');
+    }
+}
+
diff --git a/_darcs/pristine/lib/searchaction.php b/_darcs/pristine/lib/searchaction.php
new file mode 100644
index 000000000..f99883b25
--- /dev/null
+++ b/_darcs/pristine/lib/searchaction.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class SearchAction extends Action {
+
+	function is_readonly() {
+		return true;
+	}
+
+	function handle($args) {
+		parent::handle($args);
+		$this->show_form();
+	}
+
+	function show_top($arr=NULL) {
+		if ($arr) {
+			$error = $arr[1];
+		}
+		if ($error) {
+			common_element('p', 'error', $error);
+		} else {
+			$instr = $this->get_instructions();
+			$output = common_markup_to_html($instr);
+			common_element_start('div', 'instructions');
+			common_raw($output);
+			common_element_end('div');
+		}
+		$this->search_menu();
+	}
+
+	function get_title() {
+		return NULL;
+	}
+
+	function show_header($arr) {
+		return;
+	}
+
+	function show_form($error=NULL) {
+		global $config;
+
+		$q = $this->trimmed('q');
+		$page = $this->trimmed('page', 1);
+
+		common_show_header($this->get_title(), array($this, 'show_header'), array($q, $error),
+						   array($this, 'show_top'));
+		common_element_start('form', array('method' => 'get',
+										   'id' => 'login',
+										   'action' => common_local_url($this->trimmed('action'))));
+		common_element_start('p');
+		if (!isset($config['site']['fancy']) || !$config['site']['fancy']) {
+			common_element('input', array('name' => 'action',
+										  'type' => 'hidden',
+										  'value' => $this->trimmed('action')));
+		}
+		common_element('input', array('name' => 'q',
+									  'id' => 'q',
+									  'type' => 'text',
+									  'class' => 'input_text',
+									  'value' => ($q) ? $q : ''));
+		common_text(' ');
+		common_element('input', array('type' => 'submit',
+									  'id' => 'search',
+									  'name' => 'search',
+									  'class' => 'submit',
+									  'value' => _('Search')));
+
+		common_element_end('p');
+		common_element_end('form');
+		if ($q) {
+			$this->show_results($q, $page);
+		}
+		common_show_footer();
+	}
+
+	function search_menu() {
+		# action => array('prompt', 'title', $args)
+		$action = $this->trimmed('action');
+		$menu =
+		  array('peoplesearch' =>
+				array(
+					  _('People'),
+					  _('Find people on this site'),
+					  ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL),
+				'noticesearch' =>
+				array( _('Text'),
+					   _('Find content of notices'),
+					   ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL)
+				);
+		$this->nav_menu($menu);
+	}
+}
diff --git a/_darcs/pristine/lib/settingsaction.php b/_darcs/pristine/lib/settingsaction.php
new file mode 100644
index 000000000..9e783431f
--- /dev/null
+++ b/_darcs/pristine/lib/settingsaction.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class SettingsAction extends Action {
+
+    function handle($args) {
+        parent::handle($args);
+        if (!common_logged_in()) {
+            common_user_error(_('Not logged in.'));
+            return;
+        } else if (!common_is_real_login()) {
+        	# Cookie theft means that automatic logins can't
+        	# change important settings or see private info, and
+        	# _all_ our settings are important
+            common_set_returnto($this->self_url());
+            common_redirect(common_local_url('login'));
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->handle_post();
+        } else {
+            $this->show_form();
+        }
+    }
+
+    # override!
+    function handle_post() {
+        return false;
+    }
+
+    function show_form($msg=NULL, $success=false) {
+        return false;
+    }
+
+    function message($msg, $success) {
+        if ($msg) {
+            common_element('div', ($success) ? 'success' : 'error',
+                           $msg);
+        }
+    }
+
+	function form_header($title, $msg=NULL, $success=false) {
+		common_show_header($title,
+		                   NULL,
+		                   array($msg, $success),
+						   array($this, 'show_top'));
+	}
+
+	function show_top($arr) {
+		$msg = $arr[0];
+		$success = $arr[1];
+		if ($msg) {
+			$this->message($msg, $success);
+		} else {
+			$inst = $this->get_instructions();
+			$output = common_markup_to_html($inst);
+			common_element_start('div', 'instructions');
+			common_raw($output);
+			common_element_end('div');
+		}
+		$this->settings_menu();
+	}
+
+    function settings_menu() {
+        # action => array('prompt', 'title')
+		$menu =
+		  array('profilesettings' =>
+				array(_('Profile'),
+					  _('Change your profile settings')),
+				'emailsettings' =>
+				array(_('Email'),
+					  _('Change email handling')),
+				'openidsettings' =>
+				array(_('OpenID'),
+					  _('Add or remove OpenIDs')),
+				'smssettings' =>
+				array(_('SMS'),
+					  _('Updates by SMS')),
+				'imsettings' =>
+				array(_('IM'),
+					  _('Updates by instant messenger (IM)')),
+				'twittersettings' =>
+				array(_('Twitter'),
+					  _('Twitter integration options')),
+				'othersettings' =>
+				array(_('Other'),
+					  _('Other options')));
+		
+        $action = $this->trimmed('action');
+        common_element_start('ul', array('id' => 'nav_views'));
+        foreach ($menu as $menuaction => $menudesc) {
+			if ($menuaction == 'imsettings' &&
+				!common_config('xmpp', 'enabled')) {
+				continue;
+			}
+            common_menu_item(common_local_url($menuaction),
+                    $menudesc[0],
+                    $menudesc[1],
+                    $action == $menuaction);
+        }
+        common_element_end('ul');
+    }
+}
diff --git a/_darcs/pristine/lib/stream.php b/_darcs/pristine/lib/stream.php
new file mode 100644
index 000000000..27ab78137
--- /dev/null
+++ b/_darcs/pristine/lib/stream.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.	 If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/personal.php');
+require_once(INSTALLDIR.'/lib/noticelist.php');
+
+class StreamAction extends PersonalAction {
+
+	function public_views_menu() {
+
+		$action = $this->trimmed('action');
+
+		common_element_start('ul', array('id' => 'nav_views'));
+
+		common_menu_item(common_local_url('public'), _('Public'),
+			_('Public timeline'), $action == 'public');
+
+		common_menu_item(common_local_url('tag'), _('Recent tags'),
+			_('Recent tags'), $action == 'tag');
+
+		if (count(common_config('nickname', 'featured')) > 0) {
+			common_menu_item(common_local_url('featured'), _('Featured'),
+				_('Featured users'), $action == 'featured');
+		}
+
+		common_menu_item(common_local_url('favorited'), _('Popular'),
+			_("Popular notices"), $action == 'favorited');
+
+		common_element_end('ul');
+
+	}
+
+    function show_notice_list($notice) {
+        $nl = new NoticeList($notice);
+        return $nl->show();
+    }
+}
diff --git a/_darcs/pristine/lib/subs.php b/_darcs/pristine/lib/subs.php
new file mode 100644
index 000000000..91fc8445d
--- /dev/null
+++ b/_darcs/pristine/lib/subs.php
@@ -0,0 +1,140 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once('XMPPHP/XMPP.php');
+
+/* Subscribe $user to nickname $other_nickname
+  Returns true or an error message.
+*/
+
+function subs_subscribe_user($user, $other_nickname) {
+
+	$other = User::staticGet('nickname', $other_nickname);
+
+	if (!$other) {
+		return _('No such user.');
+	}
+
+	return subs_subscribe_to($user, $other);
+}
+
+/* Subscribe user $user to other user $other.
+ * Note: $other must be a local user, not a remote profile.
+ * Because the other way is quite a bit more complicated.
+ */
+
+function subs_subscribe_to($user, $other) {
+
+	if ($user->isSubscribed($other)) {
+		return _('Already subscribed!.');
+	}
+
+    if ($other->hasBlocked($user)) {
+		return _('User has blocked you.');
+    }
+
+	if (!$user->subscribeTo($other)) {
+		return _('Could not subscribe.');
+		return;
+	}
+
+    subs_notify($other, $user);
+
+	if (common_config('memcached', 'enabled')) {
+		$cache = new Memcache();
+		if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
+			$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+		}
+	}
+
+	if ($other->autosubscribe && !$other->isSubscribed($user) && !$user->hasBlocked($other)) {
+		if (!$other->subscribeTo($user)) {
+			return _('Could not subscribe other to you.');
+		}
+		if (common_config('memcached', 'enabled')) {
+			$cache = new Memcache();
+			if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
+				$cache->delete(common_cache_key('user:notices_with_friends:' . $other->id));
+			}
+		}
+
+		subs_notify($user, $other);
+	}
+
+	return true;
+}
+
+function subs_notify($listenee, $listener) {
+	# XXX: add other notifications (Jabber, SMS) here
+	# XXX: queue this and handle it offline
+	# XXX: Whatever happens, do it in Twitter-like API, too
+	subs_notify_email($listenee, $listener);
+}
+
+function subs_notify_email($listenee, $listener) {
+	mail_subscribe_notify($listenee, $listener);
+}
+
+/* Unsubscribe $user from nickname $other_nickname
+  Returns true or an error message.
+*/
+
+function subs_unsubscribe_user($user, $other_nickname) {
+
+	$other = User::staticGet('nickname', $other_nickname);
+
+	if (!$other) {
+		return _('No such user.');
+	}
+
+	return subs_unsubscribe_to($user, $other->getProfile());
+}
+
+/* Unsubscribe user $user from profile $other
+ * NB: other can be a remote user. */
+
+function subs_unsubscribe_to($user, $other) {
+
+	if (!$user->isSubscribed($other))
+		return _('Not subscribed!.');
+
+	$sub = DB_DataObject::factory('subscription');
+
+	$sub->subscriber = $user->id;
+	$sub->subscribed = $other->id;
+
+	$sub->find(true);
+
+	// note we checked for existence above
+
+	if (!$sub->delete())
+		return _('Couldn\'t delete subscription.');
+
+	if (common_config('memcached', 'enabled')) {
+		$cache = new Memcache();
+		if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
+			$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+		}
+	}
+
+	return true;
+}
+
diff --git a/_darcs/pristine/lib/theme.php b/_darcs/pristine/lib/theme.php
new file mode 100644
index 000000000..80982aa82
--- /dev/null
+++ b/_darcs/pristine/lib/theme.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+function theme_file($relative) {
+	$theme = common_config('site', 'theme');
+	return INSTALLDIR.'/theme/'.$theme.'/'.$relative;
+}
+
+function theme_path($relative) {
+	$theme = common_config('site', 'theme');
+	$server = common_config('theme', 'server');
+	if ($server) {
+		return 'http://'.$server.'/'.$theme.'/'.$relative;
+	} else {
+		return common_path('theme/'.$theme.'/'.$relative);
+	}
+}
\ No newline at end of file
diff --git a/_darcs/pristine/lib/twitter.php b/_darcs/pristine/lib/twitter.php
new file mode 100644
index 000000000..5c9ef5d6f
--- /dev/null
+++ b/_darcs/pristine/lib/twitter.php
@@ -0,0 +1,199 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+function get_twitter_data($uri, $screen_name, $password) {
+
+	$options = array(
+			CURLOPT_USERPWD => sprintf("%s:%s", $screen_name, $password),
+			CURLOPT_RETURNTRANSFER	=> true,
+			CURLOPT_FAILONERROR		=> true,
+			CURLOPT_HEADER			=> false,
+			CURLOPT_FOLLOWLOCATION	=> true,
+			// CURLOPT_USERAGENT		=> "identi.ca",
+			CURLOPT_CONNECTTIMEOUT	=> 120,
+			CURLOPT_TIMEOUT			=> 120
+	);
+
+
+	$ch = curl_init($uri);
+    curl_setopt_array($ch, $options);
+    $data = curl_exec($ch);
+    $errmsg = curl_error($ch);
+
+	if ($errmsg) {
+		common_debug("Twitter bridge - cURL error: $errmsg - trying to load: $uri with user $twit_user.",
+			__FILE__);
+	}
+
+	curl_close($ch);
+
+	return $data;
+}
+
+function twitter_user_info($screen_name, $password) {
+
+	$uri = "http://twitter.com/users/show/$screen_name.json";
+	$data = get_twitter_data($uri, $screen_name, $password);
+
+	if (!$data) {
+		return false;
+	}
+
+	$twit_user = json_decode($data);
+
+	if (!$twit_user) {
+		return false;
+	}
+
+	return $twit_user;
+}
+
+function update_twitter_user($fuser, $twitter_id, $screen_name) {
+
+	$original = clone($fuser);
+	$fuser->nickname = $screen_name;
+	$fuser->uri = 'http://twitter.com/' . $screen_name;
+	$result = $fuser->updateKeys($original);
+
+	if (!$result) {
+		common_log_db_error($fuser, 'UPDATE', __FILE__);
+		return false;
+	}
+
+	return true;
+}
+
+function add_twitter_user($twitter_id, $screen_name) {
+
+	// Otherwise, create a new Twitter user
+	$fuser = DB_DataObject::factory('foreign_user');
+
+	$fuser->nickname = $screen_name;
+	$fuser->uri = 'http://twitter.com/' . $screen_name;
+	$fuser->id = $twitter_id;
+	$fuser->service = 1; // Twitter
+	$fuser->created = common_sql_now();
+	$result = $fuser->insert();
+
+	if (!$result) {
+		common_debug("Twitter bridge - failed to add new Twitter user: $twitter_id - $screen_name.");
+		common_log_db_error($fuser, 'INSERT', __FILE__);
+		return false;
+	}
+
+	common_debug("Twitter bridge - Added new Twitter user: $screen_name ($twitter_id).");
+
+	return true;
+}
+
+// Creates or Updates a Twitter user
+function save_twitter_user($twitter_id, $screen_name) {
+
+	// Check to see whether the Twitter user is already in the system,
+	// and update its screen name and uri if so.
+	$fuser = Foreign_user::getForeignUser($twitter_id, 1);
+
+	if ($fuser) {
+
+		// Only update if Twitter screen name has changed
+		if ($fuser->nickname != $screen_name) {
+
+			common_debug('Twitter bridge - Updated nickname (and URI) for Twitter user ' .
+				"$fuser->id to $screen_name, was $fuser->nickname");
+
+			return update_twitter_user($fuser, $twitter_id, $screen_name);
+		}
+
+	} else {
+		return add_twitter_user($twitter_id, $screen_name);
+	}
+
+	return true;
+}
+
+function retreive_twitter_friends($twitter_id, $screen_name, $password) {
+
+	$uri = "http://twitter.com/statuses/friends/$twitter_id.json?page=";
+	$twitter_user = twitter_user_info($screen_name, $password);
+
+	// Calculate how many pages to get...
+	$pages = ceil($twitter_user->friends_count / 100);
+
+	if ($pages == 0) {
+		common_debug("Twitter bridge - Twitter user $screen_name has no friends! Lame.");
+	}
+
+	$friends = array();
+
+	for ($i = 1; $i <= $pages; $i++) {
+
+		$data = get_twitter_data($uri . $i, $screen_name, $password);
+
+		if (!$data) {
+			return NULL;
+		}
+
+		$more_friends = json_decode($data);
+
+		if (!$more_friends) {
+			return NULL;
+		}
+
+ 		$friends = array_merge($friends, $more_friends);
+	}
+
+	return $friends;
+}
+
+function save_twitter_friends($user, $twitter_id, $screen_name, $password) {
+
+	$friends = retreive_twitter_friends($twitter_id, $screen_name, $password);
+
+	if (is_null($friends)) {
+		common_debug("Twitter bridge - Couldn't get friends data from Twitter.");
+		return false;
+	}
+
+    foreach ($friends as $friend) {
+
+		$friend_name = $friend->screen_name;
+		$friend_id = $friend->id;
+
+		// Update or create the Foreign_user record
+		if (!save_twitter_user($friend_id, $friend_name)) {
+			return false;
+		}
+
+		// Check to see if there's a related local user
+		$flink = Foreign_link::getByForeignID($friend_id, 1);
+
+		if ($flink) {
+
+			// Get associated user and subscribe her
+			$friend_user = User::staticGet('id', $flink->user_id);
+			subs_subscribe_to($user, $friend_user);
+			common_debug("Twitter bridge - subscribed $friend_user->nickname to $user->nickname.");
+		}
+	}
+
+	return true;
+}
+
diff --git a/_darcs/pristine/lib/twitterapi.php b/_darcs/pristine/lib/twitterapi.php
new file mode 100644
index 000000000..2eb127525
--- /dev/null
+++ b/_darcs/pristine/lib/twitterapi.php
@@ -0,0 +1,657 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class TwitterapiAction extends Action {
+
+	var $auth_user;
+
+	function handle($args) {
+		parent::handle($args);
+	}
+
+	function twitter_user_array($profile, $get_notice=false) {
+
+		$twitter_user = array();
+
+		$twitter_user['name'] = $profile->getBestName();
+		$twitter_user['followers_count'] = $this->count_subscriptions($profile);
+		$twitter_user['screen_name'] = $profile->nickname;
+		$twitter_user['description'] = ($profile->bio) ? $profile->bio : NULL;
+		$twitter_user['location'] = ($profile->location) ? $profile->location : NULL;
+		$twitter_user['id'] = intval($profile->id);
+
+		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+
+		$twitter_user['profile_image_url'] = ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE);
+		$twitter_user['protected'] = 'false'; # not supported by Laconica yet
+		$twitter_user['url'] = ($profile->homepage) ? $profile->homepage : NULL;
+
+		if ($get_notice) {
+			$notice = $profile->getCurrentNotice();
+			if ($notice) {
+				# don't get user!
+				$twitter_user['status'] = $this->twitter_status_array($notice, false);
+			}
+		}
+
+		return $twitter_user;
+	}
+
+	function twitter_status_array($notice, $include_user=true) {
+
+		$profile = $notice->getProfile();
+
+		$twitter_status = array();
+		$twitter_status['text'] = $notice->content;
+		$twitter_status['truncated'] = 'false'; # Not possible on Laconica
+		$twitter_status['created_at'] = $this->date_twitter($notice->created);
+		$twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : NULL;
+		$twitter_status['source'] = $this->source_link($notice->source);
+		$twitter_status['id'] = intval($notice->id);
+		$twitter_status['in_reply_to_user_id'] = ($notice->reply_to) ? $this->replier_by_reply(intval($notice->reply_to)) : NULL;
+
+		if (isset($this->auth_user)) {
+			$twitter_status['favorited'] = ($this->auth_user->hasFave($notice)) ? 'true' : 'false';
+		} else {
+			$twitter_status['favorited'] = 'false';
+		}
+
+		if ($include_user) {
+			# Don't get notice (recursive!)
+			$twitter_user = $this->twitter_user_array($profile, false);
+			$twitter_status['user'] = $twitter_user;
+		}
+
+		return $twitter_status;
+	}
+
+	function twitter_rss_entry_array($notice) {
+
+		$profile = $notice->getProfile();
+
+		$server = common_config('site', 'server');
+		$entry = array();
+
+        # We trim() to avoid extraneous whitespace in the output
+
+		$entry['content'] = common_xml_safe_str(trim($notice->rendered));
+		$entry['title'] = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
+		$entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
+		$entry['published'] = common_date_iso8601($notice->created);
+		$entry['id'] = "tag:$server,2008:$entry[link]";
+		$entry['updated'] = $entry['published'];
+
+		# RSS Item specific
+		$entry['description'] = $entry['content'];
+		$entry['pubDate'] = common_date_rfc2822($notice->created);
+		$entry['guid'] = $entry['link'];
+
+		return $entry;
+	}
+
+	function twitter_rss_dmsg_array($message) {
+
+		$server = common_config('site', 'server');
+		$entry = array();
+
+		$entry['title'] = sprintf('Message from %s to %s',
+			$message->getFrom()->nickname, $message->getTo()->nickname);
+
+		$entry['content'] = common_xml_safe_str(trim($message->content));
+		$entry['link'] = common_local_url('showmessage', array('message' => $message->id));
+		$entry['published'] = common_date_iso8601($message->created);
+		$entry['id'] = "tag:$server,2008:$entry[link]";
+		$entry['updated'] = $entry['published'];
+
+		# RSS Item specific
+		$entry['description'] = $entry['content'];
+		$entry['pubDate'] = common_date_rfc2822($message->created);
+		$entry['guid'] = $entry['link'];
+
+		return $entry;
+	}
+
+	function twitter_dmsg_array($message) {
+
+		$twitter_dm = array();
+
+		$from_profile = $message->getFrom();
+		$to_profile = $message->getTo();
+
+		$twitter_dm['id'] = $message->id;
+		$twitter_dm['sender_id'] = $message->from_profile;
+		$twitter_dm['text'] = trim($message->content);
+		$twitter_dm['recipient_id'] = $message->to_profile;
+		$twitter_dm['created_at'] = $this->date_twitter($message->created);
+		$twitter_dm['sender_screen_name'] = $from_profile->nickname;
+		$twitter_dm['recipient_screen_name'] = $to_profile->nickname;
+		$twitter_dm['sender'] = $this->twitter_user_array($from_profile, false);
+		$twitter_dm['recipient'] = $this->twitter_user_array($to_profile, false);
+
+		return $twitter_dm;
+	}
+
+	function show_twitter_xml_status($twitter_status) {
+		common_element_start('status');
+		foreach($twitter_status as $element => $value) {
+			switch ($element) {
+			case 'user':
+				$this->show_twitter_xml_user($twitter_status['user']);
+				break;
+			case 'text':
+				common_element($element, NULL, common_xml_safe_str($value));
+				break;
+			default:
+				common_element($element, NULL, $value);
+			}
+		}
+		common_element_end('status');
+	}
+
+	function show_twitter_xml_user($twitter_user, $role='user') {
+		common_element_start($role);
+		foreach($twitter_user as $element => $value) {
+			if ($element == 'status') {
+				$this->show_twitter_xml_status($twitter_user['status']);
+			} else {
+				common_element($element, NULL, $value);
+			}
+		}
+		common_element_end($role);
+	}
+
+	function show_twitter_rss_item($entry) {
+		common_element_start('item');
+		common_element('title', NULL, $entry['title']);
+		common_element('description', NULL, $entry['description']);
+		common_element('pubDate', NULL, $entry['pubDate']);
+		common_element('guid', NULL, $entry['guid']);
+		common_element('link', NULL, $entry['link']);
+		common_element_end('item');
+	}
+
+	function show_twitter_atom_entry($entry) {
+	    common_element_start('entry');
+		common_element('title', NULL, $entry['title']);
+		common_element('content', array('type' => 'html'), $entry['content']);
+		common_element('id', NULL, $entry['id']);
+		common_element('published', NULL, $entry['published']);
+		common_element('updated', NULL, $entry['updated']);
+		common_element('link', array('href' => $entry['link'], 'rel' => 'alternate', 'type' => 'text/html'), NULL);
+		common_element_end('entry');
+	}
+
+	function show_json_objects($objects) {
+		print(json_encode($objects));
+	}
+
+	function show_single_xml_status($notice) {
+		$this->init_document('xml');
+		$twitter_status = $this->twitter_status_array($notice);
+		$this->show_twitter_xml_status($twitter_status);
+		$this->end_document('xml');
+	}
+
+	function show_single_json_status($notice) {
+		$this->init_document('json');
+		$status = $this->twitter_status_array($notice);
+		$this->show_json_objects($status);
+		$this->end_document('json');
+	}
+
+	function show_single_xml_dmsg($message) {
+		$this->init_document('xml');
+		$dmsg = $this->twitter_dmsg_array($message);
+		$this->show_twitter_xml_dmsg($dmsg);
+		$this->end_document('xml');
+	}
+
+	function show_single_json_dmsg($message) {
+		$this->init_document('json');
+		$dmsg = $this->twitter_dmsg_array($message);
+		$this->show_json_objects($dmsg);
+		$this->end_document('json');
+	}
+
+	function show_twitter_xml_dmsg($twitter_dm) {
+		common_element_start('direct_message');
+		foreach($twitter_dm as $element => $value) {
+			switch ($element) {
+			case 'sender':
+			case 'recipient':
+				$this->show_twitter_xml_user($value, $element);
+				break;
+			case 'text':
+				common_element($element, NULL, common_xml_safe_str($value));
+				break;
+			default:
+				common_element($element, NULL, $value);
+			}
+		}
+		common_element_end('direct_message');
+	}
+
+	function show_xml_timeline($notice) {
+
+		$this->init_document('xml');
+		common_element_start('statuses', array('type' => 'array'));
+
+		if (is_array($notice)) {
+			foreach ($notice as $n) {
+				$twitter_status = $this->twitter_status_array($n);
+				$this->show_twitter_xml_status($twitter_status);
+			}
+		} else {
+			while ($notice->fetch()) {
+				$twitter_status = $this->twitter_status_array($notice);
+				$this->show_twitter_xml_status($twitter_status);
+			}
+		}
+
+		common_element_end('statuses');
+		$this->end_document('xml');
+	}
+
+	function show_rss_timeline($notice, $title, $link, $subtitle, $suplink=NULL) {
+
+		$this->init_document('rss');
+
+		common_element_start('channel');
+		common_element('title', NULL, $title);
+		common_element('link', NULL, $link);
+		if (!is_null($suplink)) {
+			# For FriendFeed's SUP protocol
+			common_element('link', array('xmlns' => 'http://www.w3.org/2005/Atom',
+										 'rel' => 'http://api.friendfeed.com/2008/03#sup',
+										 'href' => $suplink,
+										 'type' => 'application/json'));
+		}
+		common_element('description', NULL, $subtitle);
+		common_element('language', NULL, 'en-us');
+		common_element('ttl', NULL, '40');
+
+		if (is_array($notice)) {
+			foreach ($notice as $n) {
+				$entry = $this->twitter_rss_entry_array($n);
+				$this->show_twitter_rss_item($entry);
+			}
+		} else {
+			while ($notice->fetch()) {
+				$entry = $this->twitter_rss_entry_array($notice);
+				$this->show_twitter_rss_item($entry);
+			}
+		}
+
+		common_element_end('channel');
+		$this->end_twitter_rss();
+	}
+
+	function show_atom_timeline($notice, $title, $id, $link, $subtitle=NULL, $suplink=NULL) {
+
+		$this->init_document('atom');
+
+		common_element('title', NULL, $title);
+		common_element('id', NULL, $id);
+		common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), NULL);
+		if (!is_null($suplink)) {
+			# For FriendFeed's SUP protocol
+			common_element('link', array('rel' => 'http://api.friendfeed.com/2008/03#sup',
+										 'href' => $suplink,
+										 'type' => 'application/json'));
+		}
+		common_element('subtitle', NULL, $subtitle);
+
+		if (is_array($notice)) {
+			foreach ($notice as $n) {
+				$entry = $this->twitter_rss_entry_array($n);
+				$this->show_twitter_atom_entry($entry);
+			}
+		} else {
+			while ($notice->fetch()) {
+				$entry = $this->twitter_rss_entry_array($notice);
+				$this->show_twitter_atom_entry($entry);
+			}
+		}
+
+		$this->end_document('atom');
+
+	}
+
+	function show_json_timeline($notice) {
+
+		$this->init_document('json');
+
+		$statuses = array();
+
+		if (is_array($notice)) {
+			foreach ($notice as $n) {
+				$twitter_status = $this->twitter_status_array($n);
+				array_push($statuses, $twitter_status);
+			}
+		} else {
+			while ($notice->fetch()) {
+				$twitter_status = $this->twitter_status_array($notice);
+				array_push($statuses, $twitter_status);
+			}
+		}
+
+		$this->show_json_objects($statuses);
+
+		$this->end_document('json');
+	}
+
+	// Anyone know what date format this is?
+	// Twitter's dates look like this: "Mon Jul 14 23:52:38 +0000 2008" -- Zach
+	function date_twitter($dt) {
+		$t = strtotime($dt);
+		return date("D M d G:i:s O Y", $t);
+	}
+
+	function replier_by_reply($reply_id) {
+		$notice = Notice::staticGet($reply_id);
+		if ($notice) {
+			$profile = $notice->getProfile();
+			if ($profile) {
+				return intval($profile->id);
+			} else {
+				common_debug('Can\'t find a profile for notice: ' . $notice->id, __FILE__);
+			}
+		} else {
+			common_debug("Can't get notice: $reply_id", __FILE__);
+		}
+		return NULL;
+	}
+
+	// XXX: Candidate for a general utility method somewhere?
+	function count_subscriptions($profile) {
+
+		$count = 0;
+		$sub = new Subscription();
+		$sub->subscribed = $profile->id;
+
+		$count = $sub->find();
+
+		if ($count > 0) {
+			return $count - 1;
+		} else {
+			return 0;
+		}
+	}
+
+	function init_document($type='xml') {
+		switch ($type) {
+		 case 'xml':
+			header('Content-Type: application/xml; charset=utf-8');
+			common_start_xml();
+			break;
+		 case 'json':
+			header('Content-Type: application/json; charset=utf-8');
+
+			// Check for JSONP callback
+			$callback = $this->arg('callback');
+			if ($callback) {
+				print $callback . '(';
+			}
+			break;
+		 case 'rss':
+			header("Content-Type: application/rss+xml; charset=utf-8");
+			$this->init_twitter_rss();
+			break;
+		 case 'atom':
+			header('Content-Type: application/atom+xml; charset=utf-8');
+			$this->init_twitter_atom();
+			break;
+		 default:
+			$this->client_error(_('Not a supported data format.'));
+			break;
+		}
+
+		return;
+	}
+
+	function end_document($type='xml') {
+		switch ($type) {
+		 case 'xml':
+			common_end_xml();
+			break;
+		 case 'json':
+
+			// Check for JSONP callback
+			$callback = $this->arg('callback');
+			if ($callback) {
+				print ')';
+			}
+			break;
+		 case 'rss':
+			$this->end_twitter_rss();
+			break;
+		 case 'atom':
+			$this->end_twitter_rss();
+			break;
+		 default:
+			$this->client_error(_('Not a supported data format.'));
+			break;
+		}
+		return;
+	}
+
+	function client_error($msg, $code = 400, $content_type = 'json') {
+
+		static $status = array(400 => 'Bad Request',
+							   401 => 'Unauthorized',
+							   402 => 'Payment Required',
+							   403 => 'Forbidden',
+							   404 => 'Not Found',
+							   405 => 'Method Not Allowed',
+							   406 => 'Not Acceptable',
+							   407 => 'Proxy Authentication Required',
+							   408 => 'Request Timeout',
+							   409 => 'Conflict',
+							   410 => 'Gone',
+							   411 => 'Length Required',
+							   412 => 'Precondition Failed',
+							   413 => 'Request Entity Too Large',
+							   414 => 'Request-URI Too Long',
+							   415 => 'Unsupported Media Type',
+							   416 => 'Requested Range Not Satisfiable',
+							   417 => 'Expectation Failed');
+
+		$action = $this->trimmed('action');
+
+		common_debug("User error '$code' on '$action': $msg", __FILE__);
+
+		if (!array_key_exists($code, $status)) {
+			$code = 400;
+		}
+
+		$status_string = $status[$code];
+		header('HTTP/1.1 '.$code.' '.$status_string);
+
+		if ($content_type == 'xml') {
+			$this->init_document('xml');
+			common_element_start('hash');
+			common_element('error', NULL, $msg);
+			common_element('request', NULL, $_SERVER['REQUEST_URI']);
+			common_element_end('hash');
+			$this->end_document('xml');
+		} else {
+			$this->init_document('json');
+			$error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
+			print(json_encode($error_array));
+			$this->end_document('json');
+		}
+
+	}
+
+	function init_twitter_rss() {
+		common_start_xml();
+		common_element_start('rss', array('version' => '2.0'));
+	}
+
+	function end_twitter_rss() {
+		common_element_end('rss');
+		common_end_xml();
+	}
+
+	function init_twitter_atom() {
+		common_start_xml();
+		common_element_start('feed', array('xmlns' => 'http://www.w3.org/2005/Atom', 'xml:lang' => 'en-US'));
+	}
+
+	function end_twitter_atom() {
+		common_end_xml();
+		common_element_end('feed');
+	}
+
+	function show_profile($profile, $content_type='xml', $notice=NULL) {
+		$profile_array = $this->twitter_user_array($profile, true);
+		switch ($content_type) {
+		 case 'xml':
+			$this->show_twitter_xml_user($profile_array);
+			break;
+		 case 'json':
+			$this->show_json_objects($profile_array);
+			break;
+		 default:
+			$this->client_error(_('Not a supported data format.'));
+			return;
+		}
+		return;
+	}
+
+	function get_user($id, $apidata=NULL) {
+		if (!$id) {
+			return $apidata['user'];
+		} else if (is_numeric($id)) {
+			return User::staticGet($id);
+		} else {
+			$nickname = common_canonical_nickname($id);
+			return User::staticGet('nickname', $nickname);
+		}
+	}
+
+	function get_profile($id) {
+		if (is_numeric($id)) {
+			return Profile::staticGet($id);
+		} else {
+			$user = User::staticGet('nickname', $id);
+			if ($user) {
+				return $user->getProfile();
+			} else {
+				return NULL;
+			}
+		}
+	}
+
+	function source_link($source) {
+		$source_name = _($source);
+		switch ($source) {
+		 case 'web':
+		 case 'xmpp':
+		 case 'mail':
+		 case 'omb':
+		 case 'api':
+			break;
+		 default:
+			$ns = Notice_source::staticGet($source);
+			if ($ns) {
+				$source_name = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+			}
+			break;
+		}
+		return $source_name;
+	}
+
+	function show_extended_profile($user, $apidata) {
+
+		$this->auth_user = $apidata['user'];
+
+		$profile = $user->getProfile();
+
+		if (!$profile) {
+			common_server_error(_('User has no profile.'));
+			return;
+		}
+
+		$twitter_user = $this->twitter_user_array($profile, true);
+
+		// Add in extended user fields offered up by this method
+		$twitter_user['created_at'] = $this->date_twitter($profile->created);
+
+		$subbed = DB_DataObject::factory('subscription');
+		$subbed->subscriber = $profile->id;
+		$subbed_count = (int) $subbed->count() - 1;
+
+		$notices = DB_DataObject::factory('notice');
+		$notices->profile_id = $profile->id;
+		$notice_count = (int) $notices->count();
+
+		$twitter_user['friends_count'] = (is_int($subbed_count)) ? $subbed_count : 0;
+		$twitter_user['statuses_count'] = (is_int($notice_count)) ? $notice_count : 0;
+
+		// Other fields Twitter sends...
+		$twitter_user['profile_background_color'] = '';
+		$twitter_user['profile_text_color'] = '';
+		$twitter_user['profile_link_color'] = '';
+		$twitter_user['profile_sidebar_fill_color'] = '';
+
+		$faves = DB_DataObject::factory('fave');
+		$faves->user_id = $user->id;
+		$faves_count = (int) $faves->count();
+		$twitter_user['favourites_count'] = $faves_count;
+
+		$timezone = 'UTC';
+
+		if ($user->timezone) {
+			$timezone = $user->timezone;
+		}
+
+		$t = new DateTime;
+		$t->setTimezone(new DateTimeZone($timezone));
+		$twitter_user['utc_offset'] = $t->format('Z');
+		$twitter_user['time_zone'] = $timezone;
+
+		$following = 'false';
+
+		if (isset($this->auth_user)) {
+			if ($this->auth_user->isSubscribed($profile)) {
+				$following = 'true';
+			}
+
+			// Not implemented yet
+			$twitter_user['notifications'] = 'false';
+		}
+
+		$twitter_user['following'] = $following;
+
+		if ($apidata['content-type'] == 'xml') {
+			$this->init_document('xml');
+			$this->show_twitter_xml_user($twitter_user);
+			$this->end_document('xml');
+		} elseif ($apidata['content-type'] == 'json') {
+			$this->init_document('json');
+			$this->show_json_objects($twitter_user);
+			$this->end_document('json');
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/_darcs/pristine/lib/util.php b/_darcs/pristine/lib/util.php
new file mode 100644
index 000000000..8eeda1115
--- /dev/null
+++ b/_darcs/pristine/lib/util.php
@@ -0,0 +1,2220 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* XXX: break up into separate modules (HTTP, HTML, user, files) */
+
+# Show a server error
+
+function common_server_error($msg, $code=500) {
+	static $status = array(500 => 'Internal Server Error',
+						   501 => 'Not Implemented',
+						   502 => 'Bad Gateway',
+						   503 => 'Service Unavailable',
+						   504 => 'Gateway Timeout',
+						   505 => 'HTTP Version Not Supported');
+
+	if (!array_key_exists($code, $status)) {
+		$code = 500;
+	}
+
+	$status_string = $status[$code];
+
+	header('HTTP/1.1 '.$code.' '.$status_string);
+	header('Content-type: text/plain');
+
+	print $msg;
+	print "\n";
+	exit();
+}
+
+# Show a user error
+function common_user_error($msg, $code=400) {
+	static $status = array(400 => 'Bad Request',
+						   401 => 'Unauthorized',
+						   402 => 'Payment Required',
+						   403 => 'Forbidden',
+						   404 => 'Not Found',
+						   405 => 'Method Not Allowed',
+						   406 => 'Not Acceptable',
+						   407 => 'Proxy Authentication Required',
+						   408 => 'Request Timeout',
+						   409 => 'Conflict',
+						   410 => 'Gone',
+						   411 => 'Length Required',
+						   412 => 'Precondition Failed',
+						   413 => 'Request Entity Too Large',
+						   414 => 'Request-URI Too Long',
+						   415 => 'Unsupported Media Type',
+						   416 => 'Requested Range Not Satisfiable',
+						   417 => 'Expectation Failed');
+
+	if (!array_key_exists($code, $status)) {
+		$code = 400;
+	}
+
+	$status_string = $status[$code];
+
+	header('HTTP/1.1 '.$code.' '.$status_string);
+
+	common_show_header('Error');
+	common_element('div', array('class' => 'error'), $msg);
+	common_show_footer();
+}
+
+$xw = null;
+
+# Start an HTML element
+function common_element_start($tag, $attrs=NULL) {
+	global $xw;
+	$xw->startElement($tag);
+	if (is_array($attrs)) {
+		foreach ($attrs as $name => $value) {
+			$xw->writeAttribute($name, $value);
+		}
+	} else if (is_string($attrs)) {
+		$xw->writeAttribute('class', $attrs);
+	}
+}
+
+function common_element_end($tag) {
+	static $empty_tag = array('base', 'meta', 'link', 'hr',
+							  'br', 'param', 'img', 'area',
+							  'input', 'col');
+	global $xw;
+	# XXX: check namespace
+	if (in_array($tag, $empty_tag)) {
+		$xw->endElement();
+	} else {
+		$xw->fullEndElement();
+	}
+}
+
+function common_element($tag, $attrs=NULL, $content=NULL) {
+	common_element_start($tag, $attrs);
+	global $xw;
+	if (!is_null($content)) {
+		$xw->text($content);
+	}
+	common_element_end($tag);
+}
+
+function common_start_xml($doc=NULL, $public=NULL, $system=NULL, $indent=true) {
+	global $xw;
+	$xw = new XMLWriter();
+	$xw->openURI('php://output');
+	$xw->setIndent($indent);
+	$xw->startDocument('1.0', 'UTF-8');
+	if ($doc) {
+		$xw->writeDTD($doc, $public, $system);
+	}
+}
+
+function common_end_xml() {
+	global $xw;
+	$xw->endDocument();
+	$xw->flush();
+}
+
+function common_init_locale($language=null) {
+    if(!$language) {
+        $language = common_language();
+    }
+    putenv('LANGUAGE='.$language);
+    putenv('LANG='.$language);
+    return setlocale(LC_ALL, $language . ".utf8",
+            $language . ".UTF8",
+            $language . ".utf-8",
+            $language . ".UTF-8",
+            $language);
+}
+
+function common_init_language() {
+	mb_internal_encoding('UTF-8');
+	$language = common_language();
+	# So we don't have to make people install the gettext locales
+ 	$locale_set = common_init_locale($language);
+	bindtextdomain("laconica", common_config('site','locale_path'));
+	bind_textdomain_codeset("laconica", "UTF-8");
+	textdomain("laconica");
+	setlocale(LC_CTYPE, 'C');
+	if(!$locale_set) {
+		common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__);
+	}
+}
+
+define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2');
+
+function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
+
+	global $config, $xw;
+    global $action; /* XXX: kind of cheating here. */
+
+	common_start_html();
+
+	common_element_start('head');
+	common_element('title', NULL,
+				   $pagetitle . " - " . $config['site']['name']);
+	common_element('link', array('rel' => 'stylesheet',
+								 'type' => 'text/css',
+								 'href' => theme_path('display.css') . '?version=' . LACONICA_VERSION,
+								 'media' => 'screen, projection, tv'));
+	foreach (array(6,7) as $ver) {
+		if (file_exists(theme_file('ie'.$ver.'.css'))) {
+			# Yes, IE people should be put in jail.
+			$xw->writeComment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
+							  'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
+		}
+	}
+
+	common_element('script', array('type' => 'text/javascript',
+								   'src' => common_path('js/jquery.min.js')),
+				   ' ');
+	common_element('script', array('type' => 'text/javascript',
+								   'src' => common_path('js/jquery.form.js')),
+				   ' ');
+	common_element('script', array('type' => 'text/javascript',
+								   'src' => common_path('js/xbImportNode.js')),
+				   ' ');
+	common_element('script', array('type' => 'text/javascript',
+								   'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
+				   ' ');
+	common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+                                        'href' =>  common_local_url('opensearch', array('type' => 'people')),
+                                        'title' => common_config('site', 'name').' People Search'));
+
+	common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+                                        'href' =>  common_local_url('opensearch', array('type' => 'notice')),
+                                        'title' => common_config('site', 'name').' Notice Search'));
+
+	if ($callable) {
+		if ($data) {
+			call_user_func($callable, $data);
+		} else {
+			call_user_func($callable);
+		}
+	}
+	common_element_end('head');
+	common_element_start('body', $action);
+	common_element_start('div', array('id' => 'wrap'));
+	common_element_start('div', array('id' => 'header'));
+	common_nav_menu();
+	if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
+		|| file_exists(theme_file('logo.png')))
+	{
+		common_element_start('a', array('href' => common_local_url('public')));
+		common_element('img', array('src' => isset($config['site']['logo']) ?
+									($config['site']['logo']) : theme_path('logo.png'),
+									'alt' => $config['site']['name'],
+									'id' => 'logo'));
+		common_element_end('a');
+	} else {
+		common_element_start('p', array('id' => 'branding'));
+		common_element('a', array('href' => common_local_url('public')),
+					   $config['site']['name']);
+		common_element_end('p');
+	}
+
+	common_element('h1', 'pagetitle', $pagetitle);
+
+	if ($headercall) {
+		if ($data) {
+			call_user_func($headercall, $data);
+		} else {
+			call_user_func($headercall);
+		}
+	}
+	common_element_end('div');
+	common_element_start('div', array('id' => 'content'));
+}
+
+function common_start_html($type=NULL, $indent=true) {
+
+	if (!$type) {
+		$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL;
+
+		# XXX: allow content negotiation for RDF, RSS, or XRDS
+
+		$type = common_negotiate_type(common_accept_to_prefs($httpaccept),
+									  common_accept_to_prefs(PAGE_TYPE_PREFS));
+
+		if (!$type) {
+			common_user_error(_('This page is not available in a media type you accept'), 406);
+			exit(0);
+		}
+	}
+
+	header('Content-Type: '.$type);
+
+	common_start_xml('html',
+					 '-//W3C//DTD XHTML 1.0 Strict//EN',
+					 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd', $indent);
+
+	# FIXME: correct language for interface
+
+	$language = common_language();
+
+	common_element_start('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
+									   'xml:lang' => $language,
+									   'lang' => $language));
+}
+
+function common_show_footer() {
+	global $xw, $config;
+	common_element_end('div'); # content div
+	common_foot_menu();
+	common_element_start('div', array('id' => 'footer'));
+	common_element_start('div', 'laconica');
+	if (common_config('site', 'broughtby')) {
+		$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+	} else {
+		$instr = _('**%%site.name%%** is a microblogging service. ');
+	}
+	$instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
+    $output = common_markup_to_html($instr);
+    common_raw($output);
+	common_element_end('div');
+	common_element('img', array('id' => 'cc',
+								'src' => $config['license']['image'],
+								'alt' => $config['license']['title']));
+	common_element_start('p');
+	common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+	common_element('a', array('class' => 'license',
+							  'rel' => 'license',
+							  'href' => $config['license']['url']),
+				   $config['license']['title']);
+	common_text(_('. Contributors should be attributed by full name or nickname.'));
+	common_element_end('p');
+	common_element_end('div');
+	common_element_end('div');
+	common_element_end('body');
+	common_element_end('html');
+	common_end_xml();
+}
+
+function common_text($txt) {
+	global $xw;
+	$xw->text($txt);
+}
+
+function common_raw($xml) {
+	global $xw;
+	$xw->writeRaw($xml);
+}
+
+function common_nav_menu() {
+	$user = common_current_user();
+	common_element_start('ul', array('id' => 'nav'));
+	if ($user) {
+		common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
+						 _('Home'));
+	}
+	common_menu_item(common_local_url('peoplesearch'), _('Search'));
+	if ($user) {
+		common_menu_item(common_local_url('profilesettings'),
+						 _('Settings'));
+		common_menu_item(common_local_url('invite'),
+						 _('Invite'));
+		common_menu_item(common_local_url('logout'),
+						 _('Logout'));
+	} else {
+		common_menu_item(common_local_url('login'), _('Login'));
+		if (!common_config('site', 'closed')) {
+			common_menu_item(common_local_url('register'), _('Register'));
+		}
+		common_menu_item(common_local_url('openidlogin'), _('OpenID'));
+	}
+	common_menu_item(common_local_url('doc', array('title' => 'help')),
+					 _('Help'));
+	common_element_end('ul');
+}
+
+function common_foot_menu() {
+	common_element_start('ul', array('id' => 'nav_sub'));
+	common_menu_item(common_local_url('doc', array('title' => 'help')),
+					 _('Help'));
+	common_menu_item(common_local_url('doc', array('title' => 'about')),
+					 _('About'));
+	common_menu_item(common_local_url('doc', array('title' => 'faq')),
+					 _('FAQ'));
+	common_menu_item(common_local_url('doc', array('title' => 'privacy')),
+					 _('Privacy'));
+	common_menu_item(common_local_url('doc', array('title' => 'source')),
+					 _('Source'));
+	common_menu_item(common_local_url('doc', array('title' => 'contact')),
+					 _('Contact'));
+	common_element_end('ul');
+}
+
+function common_menu_item($url, $text, $title=NULL, $is_selected=false) {
+	$lattrs = array();
+	if ($is_selected) {
+		$lattrs['class'] = 'current';
+	}
+	common_element_start('li', $lattrs);
+	$attrs['href'] = $url;
+	if ($title) {
+		$attrs['title'] = $title;
+	}
+	common_element('a', $attrs, $text);
+	common_element_end('li');
+}
+
+function common_input($id, $label, $value=NULL,$instructions=NULL) {
+	common_element_start('p');
+	common_element('label', array('for' => $id), $label);
+	$attrs = array('name' => $id,
+				   'type' => 'text',
+				   'class' => 'input_text',
+				   'id' => $id);
+	if ($value) {
+		$attrs['value'] = htmlspecialchars($value);
+	}
+	common_element('input', $attrs);
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
+	common_element_end('p');
+}
+
+function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value='true', $disabled=false)
+{
+	common_element_start('p');
+	$attrs = array('name' => $id,
+				   'type' => 'checkbox',
+				   'class' => 'checkbox',
+				   'id' => $id);
+	if ($value) {
+		$attrs['value'] = htmlspecialchars($value);
+	}
+	if ($checked) {
+		$attrs['checked'] = 'checked';
+	}
+	if ($disabled) {
+		$attrs['disabled'] = 'true';
+	}
+	common_element('input', $attrs);
+	common_text(' ');
+	common_element('label', array('class' => 'checkbox_label', 'for' => $id), $label);
+	common_text(' ');
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
+	common_element_end('p');
+}
+
+function common_dropdown($id, $label, $content, $instructions=NULL, $blank_select=FALSE, $selected=NULL) {
+	common_element_start('p');
+	common_element('label', array('for' => $id), $label);
+	common_element_start('select', array('id' => $id, 'name' => $id));
+	if ($blank_select) {
+		common_element('option', array('value' => ''));
+	}
+	foreach ($content as $value => $option) {
+		if ($value == $selected) {
+			common_element('option', array('value' => $value, 'selected' => $value), $option);
+		} else {
+			common_element('option', array('value' => $value), $option);
+		}
+	}
+	common_element_end('select');
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
+	common_element_end('p');
+}
+function common_hidden($id, $value) {
+	common_element('input', array('name' => $id,
+								  'type' => 'hidden',
+								  'id' => $id,
+								  'value' => $value));
+}
+
+function common_password($id, $label, $instructions=NULL) {
+	common_element_start('p');
+	common_element('label', array('for' => $id), $label);
+	$attrs = array('name' => $id,
+				   'type' => 'password',
+				   'class' => 'password',
+				   'id' => $id);
+	common_element('input', $attrs);
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
+	common_element_end('p');
+}
+
+function common_submit($id, $label, $cls='submit') {
+	global $xw;
+	common_element_start('p');
+	common_element('input', array('type' => 'submit',
+								  'id' => $id,
+								  'name' => $id,
+								  'class' => $cls,
+								  'value' => $label));
+	common_element_end('p');
+}
+
+function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
+	common_element_start('p');
+	common_element('label', array('for' => $id), $label);
+	common_element('textarea', array('rows' => 3,
+									 'cols' => 40,
+									 'name' => $id,
+									 'id' => $id),
+				   ($content) ? $content : '');
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
+	common_element_end('p');
+}
+
+function common_timezone() {
+	if (common_logged_in()) {
+		$user = common_current_user();
+		if ($user->timezone) {
+			return $user->timezone;
+		}
+	}
+
+	global $config;
+	return $config['site']['timezone'];
+}
+
+function common_language() {
+
+	// If there is a user logged in and they've set a language preference
+	// then return that one...
+        if (common_logged_in()) {
+                $user = common_current_user();
+                $user_language = $user->language;
+		if ($user_language)
+			return $user_language;
+        }
+
+	// Otherwise, find the best match for the languages requested by the
+	// user's browser...
+	$httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : NULL;
+	if (!empty($httplang)) {
+		$language = client_prefered_language($httplang);
+		if ($language)
+			return $language;
+	}
+
+	// Finally, if none of the above worked, use the site's default...
+	return common_config('site', 'language');
+}
+# salted, hashed passwords are stored in the DB
+
+function common_munge_password($password, $id) {
+	return md5($password . $id);
+}
+
+# check if a username exists and has matching password
+function common_check_user($nickname, $password) {
+	# NEVER allow blank passwords, even if they match the DB
+	if (mb_strlen($password) == 0) {
+		return false;
+	}
+	$user = User::staticGet('nickname', $nickname);
+	if (is_null($user)) {
+		return false;
+	} else {
+		if (0 == strcmp(common_munge_password($password, $user->id),
+						$user->password)) {
+			return $user;
+		} else {
+			return false;
+		}
+	}
+}
+
+# is the current user logged in?
+function common_logged_in() {
+	return (!is_null(common_current_user()));
+}
+
+function common_have_session() {
+	return (0 != strcmp(session_id(), ''));
+}
+
+function common_ensure_session() {
+	if (!common_have_session()) {
+		@session_start();
+	}
+}
+
+# Three kinds of arguments:
+# 1) a user object
+# 2) a nickname
+# 3) NULL to clear
+
+# Initialize to false; set to NULL if none found
+
+$_cur = false;
+
+function common_set_user($user) {
+
+    global $_cur;
+
+	if (is_null($user) && common_have_session()) {
+        $_cur = NULL;
+		unset($_SESSION['userid']);
+		return true;
+	} else if (is_string($user)) {
+		$nickname = $user;
+		$user = User::staticGet('nickname', $nickname);
+	} else if (!($user instanceof User)) {
+		return false;
+	}
+
+	if ($user) {
+		common_ensure_session();
+		$_SESSION['userid'] = $user->id;
+        $_cur = $user;
+		return $_cur;
+	}
+	return false;
+}
+
+function common_set_cookie($key, $value, $expiration=0) {
+	$path = common_config('site', 'path');
+	$server = common_config('site', 'server');
+
+	if ($path && ($path != '/')) {
+		$cookiepath = '/' . $path . '/';
+	} else {
+		$cookiepath = '/';
+	}
+	return setcookie($key,
+	                 $value,
+	          		 $expiration,
+			  		 $cookiepath,
+			  	     $server);
+}
+
+define('REMEMBERME', 'rememberme');
+define('REMEMBERME_EXPIRY', 30 * 24 * 60 * 60); # 30 days
+
+function common_rememberme($user=NULL) {
+	if (!$user) {
+		$user = common_current_user();
+		if (!$user) {
+			common_debug('No current user to remember', __FILE__);
+			return false;
+		}
+	}
+
+	$rm = new Remember_me();
+
+	$rm->code = common_good_rand(16);
+	$rm->user_id = $user->id;
+
+    # Wrap the insert in some good ol' fashioned transaction code
+
+    $rm->query('BEGIN');
+
+	$result = $rm->insert();
+
+	if (!$result) {
+		common_log_db_error($rm, 'INSERT', __FILE__);
+		common_debug('Error adding rememberme record for ' . $user->nickname, __FILE__);
+		return false;
+    }
+
+    $rm->query('COMMIT');
+
+	common_debug('Inserted rememberme record (' . $rm->code . ', ' . $rm->user_id . '); result = ' . $result . '.', __FILE__);
+
+    $cookieval = $rm->user_id . ':' . $rm->code;
+
+	common_log(LOG_INFO, 'adding rememberme cookie "' . $cookieval . '" for ' . $user->nickname);
+
+	common_set_cookie(REMEMBERME, $cookieval, time() + REMEMBERME_EXPIRY);
+
+	return true;
+}
+
+function common_remembered_user() {
+
+	$user = NULL;
+
+	$packed = isset($_COOKIE[REMEMBERME]) ? $_COOKIE[REMEMBERME] : NULL;
+
+	if (!$packed) {
+        return NULL;
+    }
+
+    list($id, $code) = explode(':', $packed);
+
+    if (!$id || !$code) {
+        common_log(LOG_WARNING, 'Malformed rememberme cookie: ' . $packed);
+        common_forgetme();
+        return NULL;
+    }
+
+    $rm = Remember_me::staticGet($code);
+
+    if (!$rm) {
+        common_log(LOG_WARNING, 'No such remember code: ' . $code);
+        common_forgetme();
+        return NULL;
+    }
+
+    if ($rm->user_id != $id) {
+        common_log(LOG_WARNING, 'Rememberme code for wrong user: ' . $rm->user_id . ' != ' . $id);
+        common_forgetme();
+        return NULL;
+    }
+
+    $user = User::staticGet($rm->user_id);
+
+    if (!$user) {
+        common_log(LOG_WARNING, 'No such user for rememberme: ' . $rm->user_id);
+        common_forgetme();
+        return NULL;
+    }
+
+	# successful!
+    $result = $rm->delete();
+
+    if (!$result) {
+        common_log_db_error($rm, 'DELETE', __FILE__);
+        common_log(LOG_WARNING, 'Could not delete rememberme: ' . $code);
+        common_forgetme();
+        return NULL;
+    }
+
+    common_log(LOG_INFO, 'logging in ' . $user->nickname . ' using rememberme code ' . $rm->code);
+
+    common_set_user($user);
+    common_real_login(false);
+
+    # We issue a new cookie, so they can log in
+    # automatically again after this session
+
+    common_rememberme($user);
+
+	return $user;
+}
+
+# must be called with a valid user!
+
+function common_forgetme() {
+	common_set_cookie(REMEMBERME, '', 0);
+}
+
+# who is the current user?
+function common_current_user() {
+    global $_cur;
+
+    if ($_cur === false) {
+
+        if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
+            common_ensure_session();
+            $id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false;
+            if ($id) {
+                $_cur = User::staticGet($id);
+                return $_cur;
+            }
+        }
+
+        # that didn't work; try to remember; will init $_cur to NULL on failure
+        $_cur = common_remembered_user();
+
+        if ($_cur) {
+            common_debug("Got User " . $_cur->nickname);
+            common_debug("Faking session on remembered user");
+            # XXX: Is this necessary?
+            $_SESSION['userid'] = $_cur->id;
+        }
+    }
+
+	return $_cur;
+}
+
+# Logins that are 'remembered' aren't 'real' -- they're subject to
+# cookie-stealing. So, we don't let them do certain things. New reg,
+# OpenID, and password logins _are_ real.
+
+function common_real_login($real=true) {
+	common_ensure_session();
+	$_SESSION['real_login'] = $real;
+}
+
+function common_is_real_login() {
+	return common_logged_in() && $_SESSION['real_login'];
+}
+
+# get canonical version of nickname for comparison
+function common_canonical_nickname($nickname) {
+	# XXX: UTF-8 canonicalization (like combining chars)
+	return strtolower($nickname);
+}
+
+# get canonical version of email for comparison
+function common_canonical_email($email) {
+	# XXX: canonicalize UTF-8
+	# XXX: lcase the domain part
+	return $email;
+}
+
+define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet|wais|file|prospero|aim|webcal):(([A-Za-z0-9$_.+!*(),;/?:@&~=-])|%[A-Fa-f0-9]{2}){2,}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))');
+
+function common_render_content($text, $notice) {
+	$r = common_render_text($text);
+	$id = $notice->profile_id;
+	$r = preg_replace('/(^|\s+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
+	$r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
+	$r = preg_replace('/(^|\s+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
+	return $r;
+}
+
+function common_render_text($text) {
+	$r = htmlspecialchars($text);
+
+	$r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
+	$r = preg_replace_callback('@https?://[^\]>\s]+@', 'common_render_uri_thingy', $r);
+	$r = preg_replace('/(^|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
+	# XXX: machine tags
+	return $r;
+}
+
+function common_render_uri_thingy($matches) {
+	$uri = $matches[0];
+	$trailer = '';
+
+	# Some heuristics for extracting URIs from surrounding punctuation
+	# Strip from trailing text...
+	if (preg_match('/^(.*)([,.:"\']+)$/', $uri, $matches)) {
+		$uri = $matches[1];
+		$trailer = $matches[2];
+	}
+
+	$pairs = array(
+		']' => '[', # technically disallowed in URIs, but used in Java docs
+		')' => '(', # far too frequent in Wikipedia and MSDN
+	);
+	$final = substr($uri, -1, 1);
+	if (isset($pairs[$final])) {
+		$openers = substr_count($uri, $pairs[$final]);
+		$closers = substr_count($uri, $final);
+		if ($closers > $openers) {
+			// Assume the paren was opened outside the URI
+			$uri = substr($uri, 0, -1);
+			$trailer = $final . $trailer;
+		}
+	}
+	if ($longurl = common_longurl($uri)) {
+		$longurl = htmlentities($longurl, ENT_QUOTES, 'UTF-8');
+		$title = " title='$longurl'";
+	}
+	else $title = '';
+
+	return '<a href="' . $uri . '"' . $title . ' class="extlink">' . $uri . '</a>' . $trailer;
+}
+
+function common_longurl($short_url)  {
+    $long_url = common_shorten_link($short_url, true);
+    if ($long_url === $short_url) return false;
+    return $long_url;
+}
+
+function common_longurl2($uri)  {
+	$uri_e = urlencode($uri);
+	$longurl = unserialize(file_get_contents("http://api.longurl.org/v1/expand?format=php&url=$uri_e"));
+	if (empty($longurl['long_url']) || $uri === $longurl['long_url']) return false;
+	return stripslashes($longurl['long_url']);
+}
+
+function common_shorten_links($text) {
+    if (mb_strlen($text) <= 140) return $text;
+    static $cache = array();
+    if (isset($cache[$text])) return $cache[$text];
+    // \s = not a horizontal whitespace character (since PHP 5.2.4)
+	return $cache[$text] = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $text);
+}
+
+function common_shorten_link($url, $reverse = false) {
+	static $url_cache = array();
+    if ($reverse) return isset($url_cache[$url]) ? $url_cache[$url] : $url;
+
+	$user = common_current_user();
+
+	$curlh = curl_init();
+	curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
+	curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica');
+	curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
+
+	switch($user->urlshorteningservice) {
+        case 'ur1.ca':
+            $short_url_service = new LilUrl;
+            $short_url = $short_url_service->shorten($url);
+            break;
+
+        case '2tu.us':
+            $short_url_service = new TightUrl;
+            $short_url = $short_url_service->shorten($url);
+            break;
+
+        case 'ptiturl.com':
+            $short_url_service = new PtitUrl;
+            $short_url = $short_url_service->shorten($url);
+            break;
+
+        case 'bit.ly':
+			curl_setopt($curlh, CURLOPT_URL, 'http://bit.ly/api?method=shorten&long_url='.urlencode($url));
+			$short_url = current(json_decode(curl_exec($curlh))->results)->hashUrl;
+            break;
+
+		case 'is.gd':
+			curl_setopt($curlh, CURLOPT_URL, 'http://is.gd/api.php?longurl='.urlencode($url));
+			$short_url = curl_exec($curlh);
+			break;
+		case 'snipr.com':
+			curl_setopt($curlh, CURLOPT_URL, 'http://snipr.com/site/snip?r=simple&link='.urlencode($url));
+			$short_url = curl_exec($curlh);
+			break;
+		case 'metamark.net':
+			curl_setopt($curlh, CURLOPT_URL, 'http://metamark.net/api/rest/simple?long_url='.urlencode($url));
+			$short_url = curl_exec($curlh);
+			break;
+		case 'tinyurl.com':
+			curl_setopt($curlh, CURLOPT_URL, 'http://tinyurl.com/api-create.php?url='.urlencode($url));
+			$short_url = curl_exec($curlh);
+			break;
+		default:
+			$short_url = false;
+	}
+
+	curl_close($curlh);
+
+	if ($short_url) {
+        $url_cache[(string)$short_url] = $url;
+		return (string)$short_url;
+	}
+	return $url;
+}
+
+function common_xml_safe_str($str) {
+	$xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8');
+
+	// Replace control, formatting, and surrogate characters with '*', ala Twitter
+	return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str);
+}
+
+function common_tag_link($tag) {
+	$canonical = common_canonical_tag($tag);
+	$url = common_local_url('tag', array('tag' => $canonical));
+	return '<a href="' . htmlspecialchars($url) . '" rel="tag" class="hashlink">' . htmlspecialchars($tag) . '</a>';
+}
+
+function common_canonical_tag($tag) {
+	return strtolower(str_replace(array('-', '_', '.'), '', $tag));
+}
+
+function common_valid_profile_tag($str) {
+	return preg_match('/^[A-Za-z0-9_\-\.]{1,64}$/', $str);
+}
+
+function common_at_link($sender_id, $nickname) {
+	$sender = Profile::staticGet($sender_id);
+	$recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
+	if ($recipient) {
+		return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink">'.$nickname.'</a>';
+	} else {
+		return $nickname;
+	}
+}
+
+function common_at_hash_link($sender_id, $tag) {
+	$user = User::staticGet($sender_id);
+	if (!$user) {
+		return $tag;
+	}
+	$tagged = Profile_tag::getTagged($user->id, common_canonical_tag($tag));
+	if ($tagged) {
+		$url = common_local_url('subscriptions',
+								array('nickname' => $user->nickname,
+									  'tag' => $tag));
+		return '<a href="'.htmlspecialchars($url).'" class="atlink">'.$tag.'</a>';
+	} else {
+		return $tag;
+	}
+}
+
+function common_relative_profile($sender, $nickname, $dt=NULL) {
+	# Try to find profiles this profile is subscribed to that have this nickname
+	$recipient = new Profile();
+	# XXX: use a join instead of a subquery
+	$recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender->id.' and subscribed = id)', 'AND');
+	$recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
+	if ($recipient->find(TRUE)) {
+		# XXX: should probably differentiate between profiles with
+		# the same name by date of most recent update
+		return $recipient;
+	}
+	# Try to find profiles that listen to this profile and that have this nickname
+	$recipient = new Profile();
+	# XXX: use a join instead of a subquery
+	$recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender->id.' and subscriber = id)', 'AND');
+	$recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
+	if ($recipient->find(TRUE)) {
+		# XXX: should probably differentiate between profiles with
+		# the same name by date of most recent update
+		return $recipient;
+	}
+	# If this is a local user, try to find a local user with that nickname.
+	$sender = User::staticGet($sender->id);
+	if ($sender) {
+		$recipient_user = User::staticGet('nickname', $nickname);
+		if ($recipient_user) {
+			return $recipient_user->getProfile();
+		}
+	}
+	# Otherwise, no links. @messages from local users to remote users,
+	# or from remote users to other remote users, are just
+	# outside our ability to make intelligent guesses about
+	return NULL;
+}
+
+// where should the avatar go for this user?
+
+function common_avatar_filename($id, $extension, $size=NULL, $extra=NULL) {
+	global $config;
+
+	if ($size) {
+		return $id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
+	} else {
+		return $id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
+	}
+}
+
+function common_avatar_path($filename) {
+	global $config;
+	return INSTALLDIR . '/avatar/' . $filename;
+}
+
+function common_avatar_url($filename) {
+	return common_path('avatar/'.$filename);
+}
+
+function common_avatar_display_url($avatar) {
+	$server = common_config('avatar', 'server');
+	if ($server) {
+		return 'http://'.$server.'/'.$avatar->filename;
+	} else {
+		return $avatar->url;
+	}
+}
+
+function common_default_avatar($size) {
+	static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
+							  AVATAR_STREAM_SIZE => 'stream',
+							  AVATAR_MINI_SIZE => 'mini');
+	return theme_path('default-avatar-'.$sizenames[$size].'.png');
+}
+
+function common_local_url($action, $args=NULL, $fragment=NULL) {
+	$url = NULL;
+	if (common_config('site','fancy')) {
+		$url = common_fancy_url($action, $args);
+	} else {
+		$url = common_simple_url($action, $args);
+	}
+	if (!is_null($fragment)) {
+		$url .= '#'.$fragment;
+	}
+	return $url;
+}
+
+function common_fancy_url($action, $args=NULL) {
+	switch (strtolower($action)) {
+	 case 'public':
+		if ($args && isset($args['page'])) {
+			return common_path('?page=' . $args['page']);
+		} else {
+			return common_path('');
+		}
+	 case 'featured':
+		if ($args && isset($args['page'])) {
+			return common_path('featured?page=' . $args['page']);
+		} else {
+			return common_path('featured');
+		}
+	 case 'favorited':
+		if ($args && isset($args['page'])) {
+			return common_path('favorited?page=' . $args['page']);
+		} else {
+			return common_path('favorited');
+		}
+	 case 'publicrss':
+		return common_path('rss');
+	 case 'publicatom':
+		return common_path("api/statuses/public_timeline.atom");
+	 case 'publicxrds':
+		return common_path('xrds');
+	 case 'featuredrss':
+		return common_path('featuredrss');
+	 case 'favoritedrss':
+		return common_path('favoritedrss');
+	 case 'opensearch':
+                if ($args && $args['type']) {
+                        return common_path('opensearch/'.$args['type']);
+                } else {
+                        return common_path('opensearch/people');
+                }
+	 case 'doc':
+		return common_path('doc/'.$args['title']);
+     case 'block':
+	 case 'login':
+	 case 'logout':
+	 case 'subscribe':
+	 case 'unsubscribe':
+	 case 'invite':
+		return common_path('main/'.$action);
+	 case 'tagother':
+		return common_path('main/tagother?id='.$args['id']);
+	 case 'register':
+		if ($args && $args['code']) {
+			return common_path('main/register/'.$args['code']);
+		} else {
+			return common_path('main/register');
+		}
+	 case 'remotesubscribe':
+		if ($args && $args['nickname']) {
+			return common_path('main/remote?nickname=' . $args['nickname']);
+		} else {
+			return common_path('main/remote');
+		}
+	 case 'nudge':
+	 	return common_path($args['nickname'].'/nudge');
+	 case 'openidlogin':
+		return common_path('main/openid');
+	 case 'profilesettings':
+		return common_path('settings/profile');
+	 case 'emailsettings':
+		return common_path('settings/email');
+	 case 'openidsettings':
+		return common_path('settings/openid');
+	 case 'smssettings':
+		return common_path('settings/sms');
+	 case 'twittersettings':
+		return common_path('settings/twitter');
+ 	 case 'othersettings':
+		return common_path('settings/other');
+     case 'deleteprofile':
+        return common_path('settings/delete');
+	 case 'newnotice':
+		if ($args && $args['replyto']) {
+			return common_path('notice/new?replyto='.$args['replyto']);
+		} else {
+			return common_path('notice/new');
+		}
+	 case 'shownotice':
+		return common_path('notice/'.$args['notice']);
+	 case 'deletenotice':
+                if ($args && $args['notice']) {
+                        return common_path('notice/delete/'.$args['notice']);
+                } else {
+                        return common_path('notice/delete');
+                }
+	 case 'microsummary':
+	 case 'xrds':
+	 case 'foaf':
+		return common_path($args['nickname'].'/'.$action);
+	 case 'all':
+	 case 'replies':
+	 case 'inbox':
+	 case 'outbox':
+		if ($args && isset($args['page'])) {
+			return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);
+		} else {
+			return common_path($args['nickname'].'/'.$action);
+		}
+	 case 'subscriptions':
+	 case 'subscribers':
+		$nickname = $args['nickname'];
+		unset($args['nickname']);
+		if (isset($args['tag'])) {
+			$tag = $args['tag'];
+			unset($args['tag']);
+		}
+		$params = http_build_query($args);
+		if ($params) {
+			return common_path($nickname.'/'.$action . (($tag) ? '/' . $tag : '') . '?' . $params);
+		} else {
+			return common_path($nickname.'/'.$action . (($tag) ? '/' . $tag : ''));
+		}
+	 case 'allrss':
+		return common_path($args['nickname'].'/all/rss');
+	 case 'repliesrss':
+		return common_path($args['nickname'].'/replies/rss');
+	 case 'userrss':
+        if (isset($args['limit']))
+		    return common_path($args['nickname'].'/rss?limit=' . $args['limit']);
+		return common_path($args['nickname'].'/rss');
+	 case 'showstream':
+		if ($args && isset($args['page'])) {
+			return common_path($args['nickname'].'?page=' . $args['page']);
+		} else {
+			return common_path($args['nickname']);
+		}
+
+	 case 'usertimeline':
+		return common_path("api/statuses/user_timeline/".$args['nickname'].".atom");
+	 case 'confirmaddress':
+		return common_path('main/confirmaddress/'.$args['code']);
+	 case 'userbyid':
+	 	return common_path('user/'.$args['id']);
+	 case 'recoverpassword':
+	    $path = 'main/recoverpassword';
+	    if ($args['code']) {
+	    	$path .= '/' . $args['code'];
+		}
+	    return common_path($path);
+	 case 'imsettings':
+	 	return common_path('settings/im');
+	 case 'peoplesearch':
+		return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'noticesearch':
+		return common_path('search/notice' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'noticesearchrss':
+		return common_path('search/notice/rss' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'avatarbynickname':
+		return common_path($args['nickname'].'/avatar/'.$args['size']);
+	 case 'tag':
+	    if (isset($args['tag']) && $args['tag']) {
+	    		$path = 'tag/' . $args['tag'];
+			unset($args['tag']);
+		} else {
+			$path = 'tags';
+		}
+		return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'peopletag':
+		$path = 'peopletag/' . $args['tag'];
+		unset($args['tag']);
+		return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'tags':
+		return common_path('tags' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'favor':
+		return common_path('main/favor');
+	 case 'disfavor':
+		return common_path('main/disfavor');
+	 case 'showfavorites':
+		if ($args && isset($args['page'])) {
+			return common_path($args['nickname'].'/favorites?page=' . $args['page']);
+		} else {
+			return common_path($args['nickname'].'/favorites');
+		}
+	 case 'favoritesrss':
+		return common_path($args['nickname'].'/favorites/rss');
+	 case 'showmessage':
+		return common_path('message/' . $args['message']);
+	 case 'newmessage':
+		return common_path('message/new' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'api':
+		# XXX: do fancy URLs for all the API methods
+		switch (strtolower($args['apiaction'])) {
+		 case 'statuses':
+			switch (strtolower($args['method'])) {
+			 case 'user_timeline.rss':
+				return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss');
+			 case 'user_timeline.atom':
+				return common_path('api/statuses/user_timeline/'.$args['argument'].'.atom');
+			 case 'user_timeline.json':
+				return common_path('api/statuses/user_timeline/'.$args['argument'].'.json');
+			 case 'user_timeline.xml':
+				return common_path('api/statuses/user_timeline/'.$args['argument'].'.xml');
+			 default: return common_simple_url($action, $args);
+			}
+		 default: return common_simple_url($action, $args);
+		}
+	 case 'sup':
+		if ($args && isset($args['seconds'])) {
+			return common_path('main/sup?seconds='.$args['seconds']);
+		} else {
+			return common_path('main/sup');
+		}
+	 default:
+		return common_simple_url($action, $args);
+	}
+}
+
+function common_simple_url($action, $args=NULL) {
+	global $config;
+	/* XXX: pretty URLs */
+	$extra = '';
+	if ($args) {
+		foreach ($args as $key => $value) {
+			$extra .= "&${key}=${value}";
+		}
+	}
+	return common_path("index.php?action=${action}${extra}");
+}
+
+function common_path($relative) {
+	global $config;
+	$pathpart = ($config['site']['path']) ? $config['site']['path']."/" : '';
+	return "http://".$config['site']['server'].'/'.$pathpart.$relative;
+}
+
+function common_date_string($dt) {
+	// XXX: do some sexy date formatting
+	// return date(DATE_RFC822, $dt);
+	$t = strtotime($dt);
+	$now = time();
+	$diff = $now - $t;
+
+	if ($now < $t) { # that shouldn't happen!
+		return common_exact_date($dt);
+	} else if ($diff < 60) {
+		return _('a few seconds ago');
+	} else if ($diff < 92) {
+		return _('about a minute ago');
+	} else if ($diff < 3300) {
+		return sprintf(_('about %d minutes ago'), round($diff/60));
+	} else if ($diff < 5400) {
+		return _('about an hour ago');
+	} else if ($diff < 22 * 3600) {
+		return sprintf(_('about %d hours ago'), round($diff/3600));
+	} else if ($diff < 37 * 3600) {
+		return _('about a day ago');
+	} else if ($diff < 24 * 24 * 3600) {
+		return sprintf(_('about %d days ago'), round($diff/(24*3600)));
+	} else if ($diff < 46 * 24 * 3600) {
+		return _('about a month ago');
+	} else if ($diff < 330 * 24 * 3600) {
+		return sprintf(_('about %d months ago'), round($diff/(30*24*3600)));
+	} else if ($diff < 480 * 24 * 3600) {
+		return _('about a year ago');
+	} else {
+		return common_exact_date($dt);
+	}
+}
+
+function common_exact_date($dt) {
+    static $_utc;
+    static $_siteTz;
+
+    if (!$_utc) {
+        $_utc = new DateTimeZone('UTC');
+        $_siteTz = new DateTimeZone(common_timezone());
+    }
+
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, $_utc);
+	$d->setTimezone($_siteTz);
+	return $d->format(DATE_RFC850);
+}
+
+function common_date_w3dtf($dt) {
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, new DateTimeZone('UTC'));
+	$d->setTimezone(new DateTimeZone(common_timezone()));
+	return $d->format(DATE_W3C);
+}
+
+function common_date_rfc2822($dt) {
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, new DateTimeZone('UTC'));
+	$d->setTimezone(new DateTimeZone(common_timezone()));
+	return $d->format('r');
+}
+
+function common_date_iso8601($dt) {
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, new DateTimeZone('UTC'));
+	$d->setTimezone(new DateTimeZone(common_timezone()));
+	return $d->format('c');
+}
+
+function common_sql_now() {
+	return strftime('%Y-%m-%d %H:%M:%S', time());
+}
+
+function common_redirect($url, $code=307) {
+	static $status = array(301 => "Moved Permanently",
+						   302 => "Found",
+						   303 => "See Other",
+						   307 => "Temporary Redirect");
+	header("Status: ${code} $status[$code]");
+	header("Location: $url");
+
+	common_start_xml('a',
+					 '-//W3C//DTD XHTML 1.0 Strict//EN',
+					 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+	common_element('a', array('href' => $url), $url);
+	common_end_xml();
+    exit;
+}
+
+function common_save_replies($notice) {
+	# Alternative reply format
+	$tname = false;
+	if (preg_match('/^T ([A-Z0-9]{1,64}) /', $notice->content, $match)) {
+		$tname = $match[1];
+	}
+	# extract all @messages
+	$cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $notice->content, $match);
+
+	$names = array();
+
+	if ($cnt || $tname) {
+		# XXX: is there another way to make an array copy?
+		$names = ($tname) ? array_unique(array_merge(array(strtolower($tname)), $match[1])) : array_unique($match[1]);
+	}
+
+	$sender = Profile::staticGet($notice->profile_id);
+
+	$replied = array();
+
+	# store replied only for first @ (what user/notice what the reply directed,
+	# we assume first @ is it)
+
+	for ($i=0; $i<count($names); $i++) {
+		$nickname = $names[$i];
+		$recipient = common_relative_profile($sender, $nickname, $notice->created);
+		if (!$recipient) {
+			continue;
+		}
+		if ($i == 0 && ($recipient->id != $sender->id) && !$notice->reply_to) { # Don't save reply to self
+			$reply_for = $recipient;
+			$recipient_notice = $reply_for->getCurrentNotice();
+			if ($recipient_notice) {
+				$orig = clone($notice);
+				$notice->reply_to = $recipient_notice->id;
+				$notice->update($orig);
+			}
+		}
+        # Don't save replies from blocked profile to local user
+        $recipient_user = User::staticGet('id', $recipient->id);
+        if ($recipient_user && $recipient_user->hasBlocked($sender)) {
+            continue;
+        }
+		$reply = new Reply();
+		$reply->notice_id = $notice->id;
+		$reply->profile_id = $recipient->id;
+		$id = $reply->insert();
+		if (!$id) {
+			$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+			common_log(LOG_ERR, 'DB error inserting reply: ' . $last_error->message);
+			common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
+			return;
+		} else {
+			$replied[$recipient->id] = 1;
+		}
+	}
+
+	# Hash format replies, too
+	$cnt = preg_match_all('/(?:^|\s)@#([a-z0-9]{1,64})/', $notice->content, $match);
+	if ($cnt) {
+		foreach ($match[1] as $tag) {
+			$tagged = Profile_tag::getTagged($sender->id, $tag);
+			foreach ($tagged as $t) {
+				if (!$replied[$t->id]) {
+                    # Don't save replies from blocked profile to local user
+                    $t_user = User::staticGet('id', $t->id);
+                    if ($t_user && $t_user->hasBlocked($sender)) {
+                        continue;
+                    }
+					$reply = new Reply();
+					$reply->notice_id = $notice->id;
+					$reply->profile_id = $t->id;
+					$id = $reply->insert();
+					if (!$id) {
+						common_log_db_error($reply, 'INSERT', __FILE__);
+						return;
+					}
+				}
+			}
+		}
+	}
+}
+
+function common_broadcast_notice($notice, $remote=false) {
+
+	// Check to see if notice should go to Twitter
+	$flink = Foreign_link::getByUserID($notice->profile_id, 1); // 1 == Twitter
+	if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) {
+
+		// If it's not a Twitter-style reply, or if the user WANTS to send replies...
+
+		if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
+			(($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
+
+			$result = common_twitter_broadcast($notice, $flink);
+
+			if (!$result) {
+				common_debug('Unable to send notice: ' . $notice->id . ' to Twitter.', __FILE__);
+			}
+		}
+	}
+
+	if (common_config('queue', 'enabled')) {
+		# Do it later!
+		return common_enqueue_notice($notice);
+	} else {
+		return common_real_broadcast($notice, $remote);
+	}
+}
+
+function common_twitter_broadcast($notice, $flink) {
+	global $config;
+	$success = true;
+	$fuser = $flink->getForeignUser();
+	$twitter_user = $fuser->nickname;
+	$twitter_password = $flink->credentials;
+	$uri = 'http://www.twitter.com/statuses/update.json';
+
+	// XXX: Hack to get around PHP cURL's use of @ being a a meta character
+	$statustxt = preg_replace('/^@/', ' @', $notice->content);
+
+	$options = array(
+		CURLOPT_USERPWD 		=> "$twitter_user:$twitter_password",
+		CURLOPT_POST			=> true,
+		CURLOPT_POSTFIELDS		=> array(
+									'status'	=> $statustxt,
+									'source'	=> $config['integration']['source']
+									),
+		CURLOPT_RETURNTRANSFER	=> true,
+		CURLOPT_FAILONERROR		=> true,
+		CURLOPT_HEADER			=> false,
+		CURLOPT_FOLLOWLOCATION	=> true,
+		CURLOPT_USERAGENT		=> "Laconica",
+		CURLOPT_CONNECTTIMEOUT	=> 120,  // XXX: Scary!!!! How long should this be?
+		CURLOPT_TIMEOUT			=> 120
+	);
+
+	$ch = curl_init($uri);
+    curl_setopt_array($ch, $options);
+    $data = curl_exec($ch);
+    $errmsg = curl_error($ch);
+
+	if ($errmsg) {
+		common_debug("cURL error: $errmsg - trying to send notice for $twitter_user.",
+			__FILE__);
+		$success = false;
+	}
+
+	curl_close($ch);
+
+	if (!$data) {
+		common_debug("No data returned by Twitter's API trying to send update for $twitter_user",
+			__FILE__);
+		$success = false;
+	}
+
+	// Twitter should return a status
+	$status = json_decode($data);
+
+	if (!$status->id) {
+		common_debug("Unexpected data returned by Twitter API trying to send update for $twitter_user",
+			__FILE__);
+		$success = false;
+	}
+
+	return $success;
+}
+
+# Stick the notice on the queue
+
+function common_enqueue_notice($notice) {
+	foreach (array('jabber', 'omb', 'sms', 'public') as $transport) {
+		$qi = new Queue_item();
+		$qi->notice_id = $notice->id;
+		$qi->transport = $transport;
+		$qi->created = $notice->created;
+        $result = $qi->insert();
+		if (!$result) {
+			$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+			common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
+			return false;
+		}
+		common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
+	}
+	return $result;
+}
+
+function common_dequeue_notice($notice) {
+        $qi = Queue_item::staticGet($notice->id);
+        if ($qi) {
+                $result = $qi->delete();
+	        if (!$result) {
+	            $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+                    common_log(LOG_ERR, 'DB error deleting queue item: ' . $last_error->message);
+                    return false;
+                }
+                common_log(LOG_DEBUG, 'complete dequeueing notice ID = ' . $notice->id);
+                return $result;
+        } else {
+            return false;
+        }
+}
+
+function common_real_broadcast($notice, $remote=false) {
+	$success = true;
+	if (!$remote) {
+		# Make sure we have the OMB stuff
+		require_once(INSTALLDIR.'/lib/omb.php');
+		$success = omb_broadcast_remote_subscribers($notice);
+		if (!$success) {
+			common_log(LOG_ERR, 'Error in OMB broadcast for notice ' . $notice->id);
+		}
+	}
+	if ($success) {
+		require_once(INSTALLDIR.'/lib/jabber.php');
+		$success = jabber_broadcast_notice($notice);
+		if (!$success) {
+			common_log(LOG_ERR, 'Error in jabber broadcast for notice ' . $notice->id);
+		}
+	}
+	if ($success) {
+		require_once(INSTALLDIR.'/lib/mail.php');
+		$success = mail_broadcast_notice_sms($notice);
+		if (!$success) {
+			common_log(LOG_ERR, 'Error in sms broadcast for notice ' . $notice->id);
+		}
+	}
+	if ($success) {
+		$success = jabber_public_notice($notice);
+		if (!$success) {
+			common_log(LOG_ERR, 'Error in public broadcast for notice ' . $notice->id);
+		}
+	}
+	// XXX: broadcast notices to other IM
+	return $success;
+}
+
+function common_broadcast_profile($profile) {
+	// XXX: optionally use a queue system like http://code.google.com/p/microapps/wiki/NQDQ
+	require_once(INSTALLDIR.'/lib/omb.php');
+	omb_broadcast_profile($profile);
+	// XXX: Other broadcasts...?
+	return true;
+}
+
+function common_profile_url($nickname) {
+	return common_local_url('showstream', array('nickname' => $nickname));
+}
+
+# Don't call if nobody's logged in
+
+function common_notice_form($action=NULL, $content=NULL) {
+	$user = common_current_user();
+	assert(!is_null($user));
+	common_element_start('form', array('id' => 'status_form',
+									   'method' => 'post',
+									   'action' => common_local_url('newnotice')));
+	common_element_start('p');
+	common_element('label', array('for' => 'status_textarea',
+								  'id' => 'status_label'),
+				   sprintf(_('What\'s up, %s?'), $user->nickname));
+    common_element('span', array('id' => 'counter', 'class' => 'counter'), '140');
+	common_element('textarea', array('id' => 'status_textarea',
+									 'cols' => 60,
+									 'rows' => 3,
+									 'name' => 'status_textarea'),
+				   ($content) ? $content : '');
+	common_hidden('token', common_session_token());
+	if ($action) {
+		common_hidden('returnto', $action);
+	}
+	# set by JavaScript
+	common_hidden('inreplyto', 'false');
+	common_element('input', array('id' => 'status_submit',
+								  'name' => 'status_submit',
+								  'type' => 'submit',
+								  'value' => _('Send')));
+	common_element_end('p');
+	common_element_end('form');
+}
+
+# Should make up a reasonable root URL
+
+function common_root_url() {
+	return common_path('');
+}
+
+# returns $bytes bytes of random data as a hexadecimal string
+# "good" here is a goal and not a guarantee
+
+function common_good_rand($bytes) {
+	# XXX: use random.org...?
+	if (file_exists('/dev/urandom')) {
+		return common_urandom($bytes);
+	} else { # FIXME: this is probably not good enough
+		return common_mtrand($bytes);
+	}
+}
+
+function common_urandom($bytes) {
+	$h = fopen('/dev/urandom', 'rb');
+	# should not block
+	$src = fread($h, $bytes);
+	fclose($h);
+	$enc = '';
+	for ($i = 0; $i < $bytes; $i++) {
+		$enc .= sprintf("%02x", (ord($src[$i])));
+	}
+	return $enc;
+}
+
+function common_mtrand($bytes) {
+	$enc = '';
+	for ($i = 0; $i < $bytes; $i++) {
+		$enc .= sprintf("%02x", mt_rand(0, 255));
+	}
+	return $enc;
+}
+
+function common_set_returnto($url) {
+	common_ensure_session();
+	$_SESSION['returnto'] = $url;
+}
+
+function common_get_returnto() {
+	common_ensure_session();
+	return $_SESSION['returnto'];
+}
+
+function common_timestamp() {
+	return date('YmdHis');
+}
+
+function common_ensure_syslog() {
+	static $initialized = false;
+	if (!$initialized) {
+		global $config;
+		openlog($config['syslog']['appname'], 0, LOG_USER);
+		$initialized = true;
+	}
+}
+
+function common_log($priority, $msg, $filename=NULL) {
+	$logfile = common_config('site', 'logfile');
+	if ($logfile) {
+		$log = fopen($logfile, "a");
+		if ($log) {
+			static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR',
+											  'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG');
+			$output = date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n";
+			fwrite($log, $output);
+			fclose($log);
+		}
+	} else {
+		common_ensure_syslog();
+		syslog($priority, $msg);
+	}
+}
+
+function common_debug($msg, $filename=NULL) {
+	if ($filename) {
+		common_log(LOG_DEBUG, basename($filename).' - '.$msg);
+	} else {
+		common_log(LOG_DEBUG, $msg);
+	}
+}
+
+function common_log_db_error(&$object, $verb, $filename=NULL) {
+	$objstr = common_log_objstring($object);
+	$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+	common_log(LOG_ERR, $last_error->message . '(' . $verb . ' on ' . $objstr . ')', $filename);
+}
+
+function common_log_objstring(&$object) {
+	if (is_null($object)) {
+		return "NULL";
+	}
+	$arr = $object->toArray();
+	$fields = array();
+	foreach ($arr as $k => $v) {
+		$fields[] = "$k='$v'";
+	}
+	$objstring = $object->tableName() . '[' . implode(',', $fields) . ']';
+	return $objstring;
+}
+
+function common_valid_http_url($url) {
+	return Validate::uri($url, array('allowed_schemes' => array('http', 'https')));
+}
+
+function common_valid_tag($tag) {
+	if (preg_match('/^tag:(.*?),(\d{4}(-\d{2}(-\d{2})?)?):(.*)$/', $tag, $matches)) {
+		return (Validate::email($matches[1]) ||
+				preg_match('/^([\w-\.]+)$/', $matches[1]));
+	}
+	return false;
+}
+
+# Does a little before-after block for next/prev page
+
+function common_pagination($have_before, $have_after, $page, $action, $args=NULL) {
+
+	if ($have_before || $have_after) {
+		common_element_start('div', array('id' => 'pagination'));
+		common_element_start('ul', array('id' => 'nav_pagination'));
+	}
+
+	if ($have_before) {
+		$pargs = array('page' => $page-1);
+		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+
+		common_element_start('li', 'before');
+		common_element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
+					   _('« After'));
+		common_element_end('li');
+	}
+
+	if ($have_after) {
+		$pargs = array('page' => $page+1);
+		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+		common_element_start('li', 'after');
+		common_element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
+						   _('Before »'));
+		common_element_end('li');
+	}
+
+	if ($have_before || $have_after) {
+		common_element_end('ul');
+		common_element_end('div');
+	}
+}
+
+/* Following functions are copied from MediaWiki GlobalFunctions.php
+ * and written by Evan Prodromou. */
+
+function common_accept_to_prefs($accept, $def = '*/*') {
+	# No arg means accept anything (per HTTP spec)
+	if(!$accept) {
+		return array($def => 1);
+	}
+
+	$prefs = array();
+
+	$parts = explode(',', $accept);
+
+	foreach($parts as $part) {
+		# FIXME: doesn't deal with params like 'text/html; level=1'
+		@list($value, $qpart) = explode(';', $part);
+		$match = array();
+		if(!isset($qpart)) {
+			$prefs[$value] = 1;
+		} elseif(preg_match('/q\s*=\s*(\d*\.\d+)/', $qpart, $match)) {
+			$prefs[$value] = $match[1];
+		}
+	}
+
+	return $prefs;
+}
+
+function common_mime_type_match($type, $avail) {
+	if(array_key_exists($type, $avail)) {
+		return $type;
+	} else {
+		$parts = explode('/', $type);
+		if(array_key_exists($parts[0] . '/*', $avail)) {
+			return $parts[0] . '/*';
+		} elseif(array_key_exists('*/*', $avail)) {
+			return '*/*';
+		} else {
+			return NULL;
+		}
+	}
+}
+
+function common_negotiate_type($cprefs, $sprefs) {
+	$combine = array();
+
+	foreach(array_keys($sprefs) as $type) {
+		$parts = explode('/', $type);
+		if($parts[1] != '*') {
+			$ckey = common_mime_type_match($type, $cprefs);
+			if($ckey) {
+				$combine[$type] = $sprefs[$type] * $cprefs[$ckey];
+			}
+		}
+	}
+
+	foreach(array_keys($cprefs) as $type) {
+		$parts = explode('/', $type);
+		if($parts[1] != '*' && !array_key_exists($type, $sprefs)) {
+			$skey = common_mime_type_match($type, $sprefs);
+			if($skey) {
+				$combine[$type] = $sprefs[$skey] * $cprefs[$type];
+			}
+		}
+	}
+
+	$bestq = 0;
+	$besttype = "text/html";
+
+	foreach(array_keys($combine) as $type) {
+		if($combine[$type] > $bestq) {
+			$besttype = $type;
+			$bestq = $combine[$type];
+		}
+	}
+
+	return $besttype;
+}
+
+function common_config($main, $sub) {
+	global $config;
+	return isset($config[$main][$sub]) ? $config[$main][$sub] : false;
+}
+
+function common_copy_args($from) {
+	$to = array();
+	$strip = get_magic_quotes_gpc();
+	foreach ($from as $k => $v) {
+		$to[$k] = ($strip) ? stripslashes($v) : $v;
+	}
+	return $to;
+}
+
+// Neutralise the evil effects of magic_quotes_gpc in the current request.
+// This is used before handing a request off to OAuthRequest::from_request.
+function common_remove_magic_from_request() {
+	if(get_magic_quotes_gpc()) {
+		$_POST=array_map('stripslashes',$_POST);
+		$_GET=array_map('stripslashes',$_GET);
+	}
+}
+
+function common_user_uri(&$user) {
+	return common_local_url('userbyid', array('id' => $user->id));
+}
+
+function common_notice_uri(&$notice) {
+	return common_local_url('shownotice',
+		array('notice' => $notice->id));
+}
+
+# 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
+
+function common_confirmation_code($bits) {
+	# 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
+	static $codechars = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
+	$chars = ceil($bits/5);
+	$code = '';
+	for ($i = 0; $i < $chars; $i++) {
+		# XXX: convert to string and back
+		$num = hexdec(common_good_rand(1));
+		# XXX: randomness is too precious to throw away almost
+		# 40% of the bits we get!
+		$code .= $codechars[$num%32];
+	}
+	return $code;
+}
+
+# convert markup to HTML
+
+function common_markup_to_html($c) {
+	$c = preg_replace('/%%action.(\w+)%%/e', "common_local_url('\\1')", $c);
+	$c = preg_replace('/%%doc.(\w+)%%/e', "common_local_url('doc', array('title'=>'\\1'))", $c);
+	$c = preg_replace('/%%(\w+).(\w+)%%/e', 'common_config(\'\\1\', \'\\2\')', $c);
+	return Markdown($c);
+}
+
+function common_profile_avatar_url($profile, $size=AVATAR_PROFILE_SIZE) {
+	$avatar = $profile->getAvatar($size);
+	if ($avatar) {
+		return common_avatar_display_url($avatar);
+	} else {
+		return common_default_avatar($size);
+	}
+}
+
+function common_profile_uri($profile) {
+	if (!$profile) {
+		return NULL;
+	}
+	$user = User::staticGet($profile->id);
+	if ($user) {
+		return $user->uri;
+	}
+
+	$remote = Remote_profile::staticGet($profile->id);
+	if ($remote) {
+		return $remote->uri;
+	}
+	# XXX: this is a very bad profile!
+	return NULL;
+}
+
+function common_canonical_sms($sms) {
+	# strip non-digits
+	preg_replace('/\D/', '', $sms);
+	return $sms;
+}
+
+function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
+    switch ($errno) {
+     case E_USER_ERROR:
+		common_log(LOG_ERR, "[$errno] $errstr ($errfile:$errline)");
+		exit(1);
+		break;
+
+	 case E_USER_WARNING:
+		common_log(LOG_WARNING, "[$errno] $errstr ($errfile:$errline)");
+		break;
+
+     case E_USER_NOTICE:
+		common_log(LOG_NOTICE, "[$errno] $errstr ($errfile:$errline)");
+		break;
+    }
+
+	# FIXME: show error page if we're on the Web
+    /* Don't execute PHP internal error handler */
+    return true;
+}
+
+function common_session_token() {
+	common_ensure_session();
+	if (!array_key_exists('token', $_SESSION)) {
+		$_SESSION['token'] = common_good_rand(64);
+	}
+	return $_SESSION['token'];
+}
+
+function common_disfavor_form($notice) {
+	common_element_start('form', array('id' => 'disfavor-' . $notice->id,
+									   'method' => 'post',
+									   'class' => 'disfavor',
+									   'action' => common_local_url('disfavor')));
+
+	common_element('input', array('type' => 'hidden',
+								  'name' => 'token-'. $notice->id,
+								  'id' => 'token-'. $notice->id,
+								  'class' => 'token',
+								  'value' => common_session_token()));
+
+	common_element('input', array('type' => 'hidden',
+								  'name' => 'notice',
+								  'id' => 'notice-n'. $notice->id,
+								  'class' => 'notice',
+								  'value' => $notice->id));
+
+	common_element('input', array('type' => 'submit',
+								  'id' => 'disfavor-submit-' . $notice->id,
+								  'name' => 'disfavor-submit-' . $notice->id,
+								  'class' => 'disfavor',
+								  'value' => 'Disfavor favorite',
+								  'title' => 'Remove this message from favorites'));
+	common_element_end('form');
+}
+
+function common_favor_form($notice) {
+	common_element_start('form', array('id' => 'favor-' . $notice->id,
+									   'method' => 'post',
+									   'class' => 'favor',
+									   'action' => common_local_url('favor')));
+
+	common_element('input', array('type' => 'hidden',
+								  'name' => 'token-'. $notice->id,
+								  'id' => 'token-'. $notice->id,
+								  'class' => 'token',
+								  'value' => common_session_token()));
+
+	common_element('input', array('type' => 'hidden',
+								  'name' => 'notice',
+								  'id' => 'notice-n'. $notice->id,
+								  'class' => 'notice',
+								  'value' => $notice->id));
+
+	common_element('input', array('type' => 'submit',
+								  'id' => 'favor-submit-' . $notice->id,
+								  'name' => 'favor-submit-' . $notice->id,
+								  'class' => 'favor',
+								  'value' => 'Add to favorites',
+								  'title' => 'Add this message to favorites'));
+	common_element_end('form');
+}
+
+function common_nudge_form($profile) {
+	common_element_start('form', array('id' => 'nudge', 'method' => 'post',
+									   'action' => common_local_url('nudge', array('nickname' => $profile->nickname))));
+	common_hidden('token', common_session_token());
+	common_element('input', array('type' => 'submit',
+								  'class' => 'submit',
+								  'value' => _('Send a nudge')));
+	common_element_end('form');
+}
+function common_nudge_response() {
+	common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
+}
+
+function common_subscribe_form($profile) {
+	common_element_start('form', array('id' => 'subscribe-' . $profile->id,
+									   'method' => 'post',
+									   'class' => 'subscribe',
+									   'action' => common_local_url('subscribe')));
+	common_hidden('token', common_session_token());
+	common_element('input', array('id' => 'subscribeto-' . $profile->id,
+								  'name' => 'subscribeto',
+								  'type' => 'hidden',
+								  'value' => $profile->id));
+	common_element('input', array('type' => 'submit',
+								  'class' => 'submit',
+								  'value' => _('Subscribe')));
+	common_element_end('form');
+}
+
+function common_unsubscribe_form($profile) {
+	common_element_start('form', array('id' => 'unsubscribe-' . $profile->id,
+									   'method' => 'post',
+									   'class' => 'unsubscribe',
+									   'action' => common_local_url('unsubscribe')));
+	common_hidden('token', common_session_token());
+	common_element('input', array('id' => 'unsubscribeto-' . $profile->id,
+								  'name' => 'unsubscribeto',
+								  'type' => 'hidden',
+								  'value' => $profile->id));
+	common_element('input', array('type' => 'submit',
+								  'class' => 'submit',
+								  'value' => _('Unsubscribe')));
+	common_element_end('form');
+}
+
+// XXX: Refactor this code
+function common_profile_new_message_nudge ($cur, $profile) {
+	$user = User::staticGet('id', $profile->id);
+
+	if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
+        common_element_start('li', array('id' => 'profile_send_a_new_message'));
+		common_element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
+					   _('Send a message'));
+        common_element_end('li');
+
+	    if ($user->email && $user->emailnotifynudge) {
+            common_element_start('li', array('id' => 'profile_nudge'));
+            common_nudge_form($user);
+            common_element_end('li');
+        }
+	}
+}
+
+function common_cache_key($extra) {
+	return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;
+}
+
+function common_keyize($str) {
+	$str = strtolower($str);
+	$str = preg_replace('/\s/', '_', $str);
+	return $str;
+}
+
+function common_message_form($content, $user, $to) {
+
+	common_element_start('form', array('id' => 'message_form',
+									   'method' => 'post',
+									   'action' => common_local_url('newmessage')));
+
+	$mutual_users = $user->mutuallySubscribedUsers();
+
+	$mutual = array();
+
+	while ($mutual_users->fetch()) {
+		if ($mutual_users->id != $user->id) {
+			$mutual[$mutual_users->id] = $mutual_users->nickname;
+		}
+	}
+
+	$mutual_users->free();
+	unset($mutual_users);
+
+	common_dropdown('to', _('To'), $mutual, NULL, FALSE, $to->id);
+
+	common_element_start('p');
+
+	common_element('textarea', array('id' => 'message_content',
+									 'cols' => 60,
+									 'rows' => 3,
+									 'name' => 'content'),
+				   ($content) ? $content : '');
+
+	common_element('input', array('id' => 'message_send',
+								  'name' => 'message_send',
+								  'type' => 'submit',
+								  'value' => _('Send')));
+
+	common_hidden('token', common_session_token());
+
+	common_element_end('p');
+	common_element_end('form');
+}
+
+function common_memcache() {
+	static $cache = NULL;
+	if (!common_config('memcached', 'enabled')) {
+		return NULL;
+	} else {
+		if (!$cache) {
+			$cache = new Memcache();
+			$servers = common_config('memcached', 'server');
+			if (is_array($servers)) {
+				foreach($servers as $server) {
+					$cache->addServer($server);
+				}
+			} else {
+				$cache->addServer($servers);
+			}
+		}
+		return $cache;
+	}
+}
+
+function common_compatible_license($from, $to) {
+	# XXX: better compatibility check needed here!
+	return ($from == $to);
+}
+
+/* These are almost identical, so we use a helper function */
+
+function common_block_form($profile, $args=NULL) {
+    common_blocking_form('block', _('Block'), $profile, $args);
+}
+
+function common_unblock_form($profile, $args=NULL) {
+    common_blocking_form('unblock', _('Unblock'), $profile, $args);
+}
+
+function common_blocking_form($type, $label, $profile, $args=NULL) {
+    common_element_start('form', array('id' => $type . '-' . $profile->id,
+                                       'method' => 'post',
+                                       'class' => $type,
+                                       'action' => common_local_url($type)));
+    common_hidden('token', common_session_token());
+    common_element('input', array('id' => $type . 'to-' . $profile->id,
+                                  'name' => $type . 'to',
+                                  'type' => 'hidden',
+                                  'value' => $profile->id));
+    common_element('input', array('type' => 'submit',
+                                  'class' => 'submit',
+                                  'name' => $type,
+                                  'value' => $label));
+    if ($args) {
+        foreach ($args as $k => $v) {
+            common_hidden('returnto-' . $k, $v);
+        }
+    }
+    common_element_end('form');
+    return;
+}
+
diff --git a/_darcs/pristine/lib/xmppqueuehandler.php b/_darcs/pristine/lib/xmppqueuehandler.php
new file mode 100644
index 000000000..cfc9642e4
--- /dev/null
+++ b/_darcs/pristine/lib/xmppqueuehandler.php
@@ -0,0 +1,91 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/queuehandler.php');
+
+/**
+ * Common superclass for all XMPP-using queue handlers. They all need to 
+ * service their message queues on idle, and forward any incoming messages
+ * to the XMPP listener connection. So, we abstract out common code to a
+ * superclass.
+ */
+
+class XmppQueueHandler extends QueueHandler {
+	
+	function start() {
+		# Low priority; we don't want to receive messages
+		$this->log(LOG_INFO, "INITIALIZE");
+		$this->conn = jabber_connect($this->_id);
+		if ($this->conn) {
+			$this->conn->addEventHandler('message', 'forward_message', $this);
+			$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
+			$this->conn->setReconnectTimeout(600);
+			jabber_send_presence("Send me a message to post a notice", 'available', NULL, 'available', -1);
+		}
+		return !is_null($this->conn);
+	}
+	
+	function handle_reconnect(&$pl) {
+		$this->conn->processUntil('session_start');
+		$this->conn->presence(NULL, 'available', NULL, 'available', -1);
+	}
+
+	function idle($timeout=0) {
+		# Process the queue for as long as needed
+		try {
+			if ($this->conn) {
+				$this->conn->processTime($timeout);
+			}
+		} catch (XMPPHP_Exception $e) {
+			$this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+			die($e->getMessage());
+		}
+	}
+	
+	function forward_message(&$pl) {
+		if ($pl['type'] != 'chat') {
+		    $this->log(LOG_DEBUG, 'Ignoring message of type ' . $pl['type'] . ' from ' . $pl['from']);
+			return;
+		}
+		$listener = $this->listener();
+		if (strtolower($listener) == strtolower($pl['from'])) {
+			$this->log(LOG_WARNING, 'Ignoring loop message.');
+			return;
+		}
+		$this->log(LOG_INFO, 'Forwarding message from ' . $pl['from'] . ' to ' . $listener);
+		$this->conn->message($this->listener(), $pl['body'], 'chat', NULL, $this->ofrom($pl['from']));
+	}
+
+	function ofrom($from) {
+		$address = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
+		$address .= "<address type='ofrom' jid='$from' />\n";
+		$address .= "</addresses>\n";
+		return $address;
+	}
+
+	function listener() {
+		if (common_config('xmpp', 'listener')) {
+			return common_config('xmpp', 'listener');
+		} else {
+			return jabber_daemon_address() . '/' . common_config('xmpp','resource') . '-listener';
+		}
+	}
+}