X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=6f6f1dd249121be3f5ccc34a3ebd539a48a105df;hb=33b04107231823b48ee27ca28b73266c706e105f;hp=7b821e63513d214bb298a26c892b8b108e864673;hpb=121b7e60b491ecc01634d275f6b234f2cb628f01;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 7b821e6351..5c5c7179ce 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -93,16 +93,25 @@ function common_element_start($tag, $attrs=NULL) {
 }
 
 function common_element_end($tag) {
+	static $empty_tag = array('base', 'meta', 'link', 'hr',
+							  'br', 'param', 'img', 'area',
+							  'input', 'col');
 	global $xw;
-	# TODO: switch based on $tag
-	$xw->fullEndElement();
+	# 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;
-    $xw->text($content);
-    common_element_end($tag);
+	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) {
@@ -122,47 +131,46 @@ function common_end_xml() {
 	$xw->flush();
 }
 
-define('PAGE_TYPE_PREFS', 'application/xhtml+xml,text/html;q=0.7,application/xml;q=0.3,text/xml;q=0.2');
-
-function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
-	global $config, $xw;
-
-	$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(_t('This page is not available in a media type you accept'), 406);
-		exit(0);
+function common_init_language() {
+	mb_internal_encoding('UTF-8');
+	$language = common_language();
+	# So we don't have to make people install the gettext locales
+	putenv('LANGUAGE='.$language);
+	putenv('LANG='.$language);
+	$locale_set = setlocale(LC_ALL, $language . ".utf8",
+							$language . ".UTF8",
+							$language . ".utf-8",
+							$language . ".UTF-8",
+							$language);
+	bindtextdomain("laconica", common_config('site','locale_path'));
+	bind_textdomain_codeset("laconica", "UTF-8");
+	textdomain("laconica");
+	setlocale(LC_CTYPE, 'C');
+	if(!$local_set) {
+		common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__);
 	}
+}
 
-	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');
-
-	# FIXME: correct language for interface
+define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2');
 
-	common_element_start('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
-									   'xml:lang' => 'en',
-									   'lang' => 'en'));
+function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
+	
+	global $config, $xw;
 
+	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'),
+								 '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').'" /><![endif]');
+							  'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
 		}
 	}
 
@@ -170,8 +178,18 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 								   'src' => common_path('js/jquery.min.js')),
 				   ' ');
 	common_element('script', array('type' => 'text/javascript',
-								   'src' => common_path('js/util.js')),
+								   'src' => common_path('js/jquery.form.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) {
@@ -185,11 +203,11 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 	common_element_start('div', array('id' => 'wrap'));
 	common_element_start('div', array('id' => 'header'));
 	common_nav_menu();
-	if ((is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
+	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' => ($config['site']['logo']) ?
+		common_element('img', array('src' => isset($config['site']['logo']) ?
 									($config['site']['logo']) : theme_path('logo.png'),
 									'alt' => $config['site']['name'],
 									'id' => 'logo'));
@@ -214,6 +232,37 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 	common_element_start('div', array('id' => 'content'));
 }
 
+function common_start_html($type=NULL) {
+	
+	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');
+
+	# 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
@@ -221,15 +270,11 @@ function common_show_footer() {
 	common_element_start('div', array('id' => 'footer'));
 	common_element_start('div', 'laconica');
 	if (common_config('site', 'broughtby')) {
-		$instr = _t('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+		$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
 	} else {
-		$instr = _t('**%%site.name%%** is a microblogging service. ');
+		$instr = _('**%%site.name%%** is a microblogging service. ');
 	}
-	$instr .= _t('It runs the [Laconica](http://laconi.ca/) ' .
-		         'microblogging software, version ' . LACONICA_VERSION . ', ' .
-		         'available under the ' .
-		         '[GNU Affero General Public License]' .
-		         '(http://www.fsf.org/licensing/licenses/agpl-3.0.html).');
+	$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');
@@ -237,12 +282,12 @@ function common_show_footer() {
 								'src' => $config['license']['image'],
 								'alt' => $config['license']['title']));
 	common_element_start('p');
-	common_text(_t('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+	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']),
+							  'href' => $config['license']['url']),
 				   $config['license']['title']);
-	common_text(_t('. Contributors should be attributed by full name or nickname.'));
+	common_text(_('. Contributors should be attributed by full name or nickname.'));
 	common_element_end('p');
 	common_element_end('div');
 	common_element_end('div');
@@ -266,36 +311,41 @@ function common_nav_menu() {
 	common_element_start('ul', array('id' => 'nav'));
 	if ($user) {
 		common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
-						 _t('Home'));
+						 _('Home'));
 	}
-	common_menu_item(common_local_url('public'), _t('Public'));
-	common_menu_item(common_local_url('doc', array('title' => 'help')),
-					 _t('Help'));
+	common_menu_item(common_local_url('peoplesearch'), _('Search'));
+	common_menu_item(common_local_url('tags'), _('Tags'));
 	if ($user) {
 		common_menu_item(common_local_url('profilesettings'),
-						 _t('Settings'));
+						 _('Settings'));
+		common_menu_item(common_local_url('invite'),
+						 _('Invite'));
 		common_menu_item(common_local_url('logout'),
-						 _t('Logout'));
+						 _('Logout'));
 	} else {
-		common_menu_item(common_local_url('login'), _t('Login'));
-		common_menu_item(common_local_url('register'), _t('Register'));
-		common_menu_item(common_local_url('openidlogin'), _t('OpenID'));
+		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_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')),
-					 _t('About'));
+					 _('About'));
 	common_menu_item(common_local_url('doc', array('title' => 'faq')),
-					 _t('FAQ'));
+					 _('FAQ'));
 	common_menu_item(common_local_url('doc', array('title' => 'privacy')),
-					 _t('Privacy'));
+					 _('Privacy'));
 	common_menu_item(common_local_url('doc', array('title' => 'source')),
-					 _t('Source'));
+					 _('Source'));
 	common_menu_item(common_local_url('doc', array('title' => 'contact')),
-					 _t('Contact'));
+					 _('Contact'));
 	common_element_end('ul');
 }
 
@@ -330,7 +380,7 @@ function common_input($id, $label, $value=NULL,$instructions=NULL) {
 	common_element_end('p');
 }
 
-function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value='true')
+function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value='true', $disabled=false)
 {
 	common_element_start('p');
 	$attrs = array('name' => $id,
@@ -343,6 +393,9 @@ function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value
 	if ($checked) {
 		$attrs['checked'] = 'checked';
 	}
+	if ($disabled) {
+		$attrs['disabled'] = 'true';
+	}
 	common_element('input', $attrs);
 	# XXX: use a <label>
 	common_text(' ');
@@ -354,6 +407,26 @@ function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value
 	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',
@@ -375,13 +448,13 @@ function common_password($id, $label, $instructions=NULL) {
 	common_element_end('p');
 }
 
-function common_submit($id, $label) {
+function common_submit($id, $label, $cls='submit') {
 	global $xw;
 	common_element_start('p');
 	common_element('input', array('type' => 'submit',
 								  'id' => $id,
 								  'name' => $id,
-								  'class' => 'submit',
+								  'class' => $cls,
 								  'value' => $label));
 	common_element_end('p');
 }
@@ -400,6 +473,41 @@ function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
 	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) {
@@ -408,12 +516,20 @@ function common_munge_password($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 {
-		return (0 == strcmp(common_munge_password($password, $user->id),
-							$user->password));
+		if (0 == strcmp(common_munge_password($password, $user->id),
+						$user->password)) {
+			return $user;
+		} else {
+			return false;
+		}
 	}
 }
 
@@ -432,19 +548,26 @@ function common_ensure_session() {
 	}
 }
 
-function common_set_user($nickname) {
-	if (is_null($nickname) && common_have_session()) {
+# Three kinds of arguments:
+# 1) a user object
+# 2) a nickname
+# 3) NULL to clear
+
+function common_set_user($user) {
+	if (is_null($user) && common_have_session()) {
 		unset($_SESSION['userid']);
 		return true;
-	} else {
+	} else if (is_string($user)) {
+		$nickname = $user;
 		$user = User::staticGet('nickname', $nickname);
-		if ($user) {
-			common_ensure_session();
-			$_SESSION['userid'] = $user->id;
-			return true;
-		} else {
-			return false;
-		}
+	} else if (!($user instanceof User)) {
+		return false;
+	}
+
+	if ($user) {
+		common_ensure_session();
+		$_SESSION['userid'] = $user->id;
+		return $user;
 	}
 	return false;
 }
@@ -468,10 +591,13 @@ function common_set_cookie($key, $value, $expiration=0) {
 define('REMEMBERME', 'rememberme');
 define('REMEMBERME_EXPIRY', 30 * 24 * 60 * 60);
 
-function common_rememberme() {
-	$user = common_current_user();
+function common_rememberme($user=NULL) {
 	if (!$user) {
-		return false;
+		$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);
@@ -479,17 +605,20 @@ function common_rememberme() {
 	$result = $rm->insert();
 	if (!$result) {
 		common_log_db_error($rm, 'INSERT', __FILE__);
+		common_debug('Error adding rememberme record for ' . $user->nickname, __FILE__);
 		return false;
 	}
+	common_log(LOG_INFO, 'adding rememberme cookie for ' . $user->nickname);
 	common_set_cookie(REMEMBERME,
 					  implode(':', array($rm->user_id, $rm->code)),
 					  time() + REMEMBERME_EXPIRY);
+	return true;
 }
 
 function common_remembered_user() {
 	$user = NULL;
 	# Try to remember
-	$packed = $_COOKIE[REMEMBERME];
+	$packed = isset($_COOKIE[REMEMBERME]) ? $_COOKIE[REMEMBERME] : '';
 	if ($packed) {
 		list($id, $code) = explode(':', $packed);
 		if ($id && $code) {
@@ -503,11 +632,12 @@ function common_remembered_user() {
 						common_log_db_error($rm, 'DELETE', __FILE__);
 						$user = NULL;
 					} else {
+						common_log(LOG_INFO, 'logging in ' . $user->nickname . ' using rememberme code ' . $rm->code);
 						common_set_user($user->nickname);
 						common_real_login(false);
 						# We issue a new cookie, so they can log in
 						# automatically again after this session
-						common_rememberme();
+						common_rememberme($user);
 					}
 				}
 			}
@@ -524,9 +654,9 @@ function common_forgetme() {
 
 # who is the current user?
 function common_current_user() {
-	if ($_REQUEST[session_name()]) {
+	if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
 		common_ensure_session();
-		$id = $_SESSION['userid'];
+		$id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false;
 		if ($id) {
 			# note: this should cache
 			$user = User::staticGet($id);
@@ -535,6 +665,11 @@ function common_current_user() {
 	}
 	# that didn't work; try to remember
 	$user = common_remembered_user();
+	if ($user) {
+		common_debug("Got User " . $user->nickname);
+	    common_debug("Faking session on remembered user");
+	    $_SESSION['userid'] = $user->id;
+	}
 	return $user;
 }
 
@@ -567,44 +702,111 @@ function common_canonical_email($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 = htmlspecialchars($text);
+	$r = common_render_text($text);
 	$id = $notice->profile_id;
-	$r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
-	$r = preg_replace('/(^|\s+)@([a-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
-	# XXX: # tags
+	$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);
+	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;
+		}
+	}
+	return '<a href="' . $uri . '" class="extlink">' . $uri . '</a>' . $trailer;
+}
+
+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_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_relative_profile($sender, $nickname, $dt=NULL) {
 	# Try to find profiles this profile is subscribed to that have this nickname
 	$recipient = new Profile();
-	# XXX: chokety and bad
-	$recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender_id.' and subscribed = id)', 'AND');
+	# 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)) {
-		return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink tolistenee">'.$nickname.'</a>';
+		# 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: chokety and bad
-	$recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender_id.' and subscriber = id)', 'AND');
+	# 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)) {
-		return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink tolistener">'.$nickname.'</a>';
+		# 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);
+	$sender = User::staticGet($sender->id);
 	if ($sender) {
 		$recipient_user = User::staticGet('nickname', $nickname);
 		if ($recipient_user) {
-			return '<a href="'.htmlspecialchars(common_profile_url($nickname)).'" class="atlink usertouser">'.$nickname.'</a>';
+			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 $nickname;
+	return NULL;
 }
 
 // where should the avatar go for this user?
@@ -625,12 +827,16 @@ function common_avatar_path($filename) {
 }
 
 function common_avatar_url($filename) {
-    $server = common_config('avatar', 'server');
-    if ($server) {
-	return 'http://'.$server.'/'.$filename;
-    } else {
 	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) {
@@ -640,19 +846,23 @@ function common_default_avatar($size) {
 	return theme_path('default-avatar-'.$sizenames[$size].'.png');
 }
 
-function common_local_url($action, $args=NULL) {
-	global $config;
-	if ($config['site']['fancy']) {
-		return common_fancy_url($action, $args);
+function common_local_url($action, $args=NULL, $fragment=NULL) {
+	$url = NULL;
+	if (common_config('site','fancy')) {
+		$url = common_fancy_url($action, $args);
 	} else {
-		return common_simple_url($action, $args);
+		$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 && $args['page']) {
+		if ($args && isset($args['page'])) {
 			return common_path('?page=' . $args['page']);
 		} else {
 			return common_path('');
@@ -661,14 +871,26 @@ function common_fancy_url($action, $args=NULL) {
 		return common_path('rss');
 	 case 'publicxrds':
 		return common_path('xrds');
+	 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 'login':
 	 case 'logout':
-	 case 'register':
 	 case 'subscribe':
 	 case 'unsubscribe':
+	 case 'invite':
 		return common_path('main/'.$action);
+	 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']);
@@ -677,34 +899,52 @@ function common_fancy_url($action, $args=NULL) {
 		}
 	 case 'openidlogin':
 		return common_path('main/openid');
-	 case 'avatar':
-	 case 'password':
-		return common_path('settings/'.$action);
 	 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 'newnotice':
-		return common_path('notice/new');
+		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 'xrds':
 	 case 'foaf':
 		return common_path($args['nickname'].'/'.$action);
 	 case 'subscriptions':
 	 case 'subscribers':
 	 case 'all':
-		if ($args && $args['page']) {
+	 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 'allrss':
 		return common_path($args['nickname'].'/all/rss');
+	 case 'repliesrss':
+		return common_path($args['nickname'].'/replies/rss');
 	 case 'userrss':
 		return common_path($args['nickname'].'/rss');
 	 case 'showstream':
-		if ($args && $args['page']) {
+		if ($args && isset($args['page'])) {
 			return common_path($args['nickname'].'?page=' . $args['page']);
 		} else {
 			return common_path($args['nickname']);
@@ -721,6 +961,63 @@ function common_fancy_url($action, $args=NULL) {
 	    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 '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'].'.rss');
+			 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'].'.rss');
+			 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);
 	}
@@ -754,38 +1051,68 @@ function common_date_string($dt) {
 	if ($now < $t) { # that shouldn't happen!
 		return common_exact_date($dt);
 	} else if ($diff < 60) {
-		return _t('a few seconds ago');
+		return _('a few seconds ago');
 	} else if ($diff < 92) {
-		return _t('about a minute ago');
+		return _('about a minute ago');
 	} else if ($diff < 3300) {
-		return _t('about ') . round($diff/60) . _t(' minutes ago');
+		return sprintf(_('about %d minutes ago'), round($diff/60));
 	} else if ($diff < 5400) {
-		return _t('about an hour ago');
+		return _('about an hour ago');
 	} else if ($diff < 22 * 3600) {
-		return _t('about ') . round($diff/3600) . _t(' hours ago');
+		return sprintf(_('about %d hours ago'), round($diff/3600));
 	} else if ($diff < 37 * 3600) {
-		return _t('about a day ago');
+		return _('about a day ago');
 	} else if ($diff < 24 * 24 * 3600) {
-		return _t('about ') . round($diff/(24*3600)) . _t(' days ago');
+		return sprintf(_('about %d days ago'), round($diff/(24*3600)));
 	} else if ($diff < 46 * 24 * 3600) {
-		return _t('about a month ago');
+		return _('about a month ago');
 	} else if ($diff < 330 * 24 * 3600) {
-		return _t('about ') . round($diff/(30*24*3600)) . _t(' months ago');
+		return sprintf(_('about %d months ago'), round($diff/(30*24*3600)));
 	} else if ($diff < 480 * 24 * 3600) {
-		return _t('about a year ago');
+		return _('about a year ago');
 	} else {
 		return common_exact_date($dt);
 	}
 }
 
 function common_exact_date($dt) {
-	$t = strtotime($dt);
-	return date(DATE_RFC850, $t);
+    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) {
-	$t = strtotime($dt);
-	return date(DATE_W3C, $t);
+	$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) {
@@ -801,20 +1128,205 @@ function common_redirect($url, $code=307) {
 					 '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);
+	if (!$cnt && !$tname) {
+		return true;
+	}
+	# 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);
+	# 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);
+			}
+		}
+		$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;
+		}
+	}
 }
 
 function common_broadcast_notice($notice, $remote=false) {
-	// XXX: optionally use a queue system like http://code.google.com/p/microapps/wiki/NQDQ
+
+	// Check to see if notice should go to Twitter
+	$flink = Foreign_link::getForeignLink($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');
-		omb_broadcast_remote_subscribers($notice);
+		$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);
+		}
 	}
-	require_once(INSTALLDIR.'/lib/jabber.php');
-	jabber_broadcast_notice($notice);
-	// XXX: broadcast notices to SMS
 	// XXX: broadcast notices to other IM
-	return true;
+	return $success;
 }
 
 function common_broadcast_profile($profile) {
@@ -840,7 +1352,7 @@ function common_notice_form($action=NULL, $content=NULL) {
 	common_element_start('p');
 	common_element('label', array('for' => 'status_textarea',
 								  'id' => 'status_label'),
-				   _t('What\'s up, ').$user->nickname.'?');
+				   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,
@@ -850,21 +1362,16 @@ function common_notice_form($action=NULL, $content=NULL) {
 	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' => _t('Send')));
+								  'value' => _('Send')));
 	common_element_end('p');
 	common_element_end('form');
 }
 
-function common_mint_tag($extra) {
-	global $config;
-	return
-	  'tag:'.$config['tag']['authority'].','.
-	  $config['tag']['date'].':'.$config['tag']['prefix'].$extra;
-}
-
 # Should make up a reasonable root URL
 
 function common_root_url() {
@@ -917,25 +1424,30 @@ function common_timestamp() {
 	return date('YmdHis');
 }
 
-// XXX: set up gettext
-
-function _t($str) {
-	return $str;
-}
-
 function common_ensure_syslog() {
 	static $initialized = false;
 	if (!$initialized) {
 		global $config;
-		define_syslog_variables();
 		openlog($config['syslog']['appname'], 0, LOG_USER);
 		$initialized = true;
 	}
 }
 
 function common_log($priority, $msg, $filename=NULL) {
-	common_ensure_syslog();
-#	syslog($priority, $msg);
+	$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) {
@@ -949,7 +1461,7 @@ function common_debug($msg, $filename=NULL) {
 function common_log_db_error(&$object, $verb, $filename=NULL) {
 	$objstr = common_log_objstring($object);
 	$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-	common_log(LOG_ERROR, $last_error->message . '(' . $verb . ' on ' . $objstr . ')', $filename);
+	common_log(LOG_ERR, $last_error->message . '(' . $verb . ' on ' . $objstr . ')', $filename);
 }
 
 function common_log_objstring(&$object) {
@@ -992,7 +1504,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 
 		common_element_start('li', 'before');
 		common_element('a', array('href' => common_local_url($action, $newargs)),
-					   _t('« After'));
+					   _('« After'));
 		common_element_end('li');
 	}
 
@@ -1001,7 +1513,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
 		common_element_start('li', 'after');
 		common_element('a', array('href' => common_local_url($action, $newargs)),
-						   _t('Before »'));
+						   _('Before »'));
 		common_element_end('li');
 	}
 
@@ -1091,7 +1603,7 @@ function common_negotiate_type($cprefs, $sprefs) {
 
 function common_config($main, $sub) {
 	global $config;
-	return $config[$main][$sub];
+	return isset($config[$main][$sub]) ? $config[$main][$sub] : false;
 }
 
 function common_copy_args($from) {
@@ -1103,6 +1615,15 @@ function common_copy_args($from) {
 	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));
 }
@@ -1137,3 +1658,164 @@ function common_markup_to_html($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_hidden('token', common_session_token());
+	common_hidden('notice', $notice->id);
+	common_element('input', array('type' => 'submit',
+								  'id' => 'disfavor-submit-' . $notice->id,
+								  'name' => 'disfavor-submit-' . $notice->id,
+								  'class' => 'disfavor',
+								  'value' => '♥'));
+	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_hidden('token', common_session_token());
+	common_hidden('notice', $notice->id);
+	common_element('input', array('type' => 'submit',
+								  'id' => 'favor-submit-' . $notice->id,
+								  'name' => 'favor-submit-' . $notice->id,
+								  'class' => 'favor',
+								  'value' => '♡'));
+	common_element_end('form');
+}
+
+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;
+	}
+}