X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=11967709106c9481200ff733142df5c02a181051;hb=a1da43417e319b7cd49199667794163ad8e3d8ed;hp=0b71cfe4f596e321e9dceaa2fe524f952ccff320;hpb=b57182a8efd306ea0e8891785412990fbc256c36;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 0b71cfe4f5..1196770910 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -114,11 +114,11 @@ function common_element($tag, $attrs=NULL, $content=NULL) {
 	common_element_end($tag);
 }
 
-function common_start_xml($doc=NULL, $public=NULL, $system=NULL) {
+function common_start_xml($doc=NULL, $public=NULL, $system=NULL, $indent=true) {
 	global $xw;
 	$xw = new XMLWriter();
 	$xw->openURI('php://output');
-	$xw->setIndent(true);
+	$xw->setIndent($indent);
 	$xw->startDocument('1.0', 'UTF-8');
 	if ($doc) {
 		$xw->writeDTD($doc, $public, $system);
@@ -146,51 +146,31 @@ function common_init_language() {
 	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;
 
-	$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));
-
+	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]');
 		}
 	}
 
@@ -201,7 +181,10 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 								   'src' => common_path('js/jquery.form.js')),
 				   ' ');
 	common_element('script', array('type' => 'text/javascript',
-								   'src' => common_path('js/util.js')),
+								   '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')),
@@ -252,6 +235,37 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 	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
@@ -303,7 +317,6 @@ function common_nav_menu() {
 						 _('Home'));
 	}
 	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'),
 						 _('Settings'));
@@ -318,6 +331,8 @@ function common_nav_menu() {
 		}
 		common_menu_item(common_local_url('openidlogin'), _('OpenID'));
 	}
+	common_menu_item(common_local_url('doc', array('title' => 'help')),
+					 _('Help'));
 	common_element_end('ul');
 }
 
@@ -369,7 +384,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,
@@ -382,6 +397,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(' ');
@@ -472,25 +490,27 @@ function common_timezone() {
 }
 
 function common_language() {
-	$httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : NULL;
-        $language = array();
-        $user_language = FALSE;
 
+	// 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;
         }
 
-        if ($user_language) {
-                return $user_language;
-        } else if (!empty($httplang)) {
-                $language = client_prefered_language($httplang);
-                if ($language) {
-                    return $language;
-                }
-        } else {
-                return $config['site']['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
 
@@ -686,24 +706,149 @@ 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 = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
+	$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-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_tag_link($tag) {
-	if(common_config('site', 'fancy')) {
-		return '<a href="' . htmlspecialchars(common_path('tag/' . strtolower(str_replace(array('-', '_', '.'), '', $tag)))) . '" rel="tag" class="hashlink">' . htmlspecialchars($tag) . '</a>';
-	} else {
-		return '<a href="' . htmlspecialchars(common_path('index.php?action=tag&tag=' . strtolower(str_replace(array('-', '_', '.'), '', $tag)))) . '" rel="tag" class="hashlink">' . htmlspecialchars($tag) . '</a>';
+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($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) {
+    // \s = not a horizontal whitespace character (since PHP 5.2.4)
+	// RYM this should prevent * preceded URLs from being processed but it its a char
+//	$r = preg_replace('@[^*](https?://[^)\]>\s]+)@e', "common_shorten_link('\\1')", $r);
+	return preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $text);
+}
+
+function common_shorten_link($long_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($long_url);
+            break;
+            
+        case '2tu.us':
+            $short_url_service = new TightUrl;
+            $short_url = $short_url_service->shorten($long_url);
+            break;
+            
+        case 'ptiturl.com':
+            $short_url_service = new PtitUrl;
+            $short_url = $short_url_service->shorten($long_url);
+            break;
+
+        case 'bit.ly':
+			curl_setopt($curlh, CURLOPT_URL, 'http://bit.ly/api?method=shorten&long_url='.urlencode($long_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($long_url));
+			$short_url = curl_exec($curlh);
+			break;
+		case 'snipr.com':
+			curl_setopt($curlh, CURLOPT_URL, 'http://snipr.com/site/snip?r=simple&link='.urlencode($long_url));
+			$short_url = curl_exec($curlh);
+			break;
+		case 'metamark.net':
+			curl_setopt($curlh, CURLOPT_URL, 'http://metamark.net/api/rest/simple?long_url='.urlencode($long_url));
+			$short_url = curl_exec($curlh);
+			break;
+		case 'tinyurl.com':
+			curl_setopt($curlh, CURLOPT_URL, 'http://tinyurl.com/api-create.php?url='.urlencode($long_url));
+			$short_url = curl_exec($curlh);
+			break;
+		default:
+			$short_url = false;
+	}
+	
+	curl_close($curlh);
+	
+	if ($short_url) {
+		return $short_url;
 	}
+	return $long_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) {
@@ -716,6 +861,22 @@ function common_at_link($sender_id, $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();
@@ -788,13 +949,17 @@ 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) {
@@ -805,10 +970,26 @@ function common_fancy_url($action, $args=NULL) {
 		} 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 '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']);
@@ -823,6 +1004,8 @@ function common_fancy_url($action, $args=NULL) {
 	 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']);
@@ -835,6 +1018,8 @@ function common_fancy_url($action, $args=NULL) {
 		} else {
 			return common_path('main/remote');
 		}
+	 case 'nudge':
+	 	return common_path($args['nickname'].'/nudge');
 	 case 'openidlogin':
 		return common_path('main/openid');
 	 case 'profilesettings':
@@ -847,6 +1032,8 @@ function common_fancy_url($action, $args=NULL) {
 		return common_path('settings/sms');
 	 case 'twittersettings':
 		return common_path('settings/twitter');
+ 	 case 'othersettings':
+		return common_path('settings/other');
 	 case 'newnotice':
 		if ($args && $args['replyto']) {
 			return common_path('notice/new?replyto='.$args['replyto']);
@@ -861,11 +1048,10 @@ function common_fancy_url($action, $args=NULL) {
                 } else {
                         return common_path('notice/delete');
                 }
+	 case 'microsummary':
 	 case 'xrds':
 	 case 'foaf':
 		return common_path($args['nickname'].'/'.$action);
-	 case 'subscriptions':
-	 case 'subscribers':
 	 case 'all':
 	 case 'replies':
 	 case 'inbox':
@@ -875,6 +1061,20 @@ function common_fancy_url($action, $args=NULL) {
 		} 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':
@@ -887,6 +1087,9 @@ function common_fancy_url($action, $args=NULL) {
 		} 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':
@@ -915,6 +1118,10 @@ function common_fancy_url($action, $args=NULL) {
 			$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':
@@ -927,6 +1134,35 @@ function common_fancy_url($action, $args=NULL) {
 		} 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);
 	}
@@ -1048,21 +1284,28 @@ function common_save_replies($notice) {
 	}
 	# extract all @messages
 	$cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $notice->content, $match);
-	if (!$cnt && !$tname) {
-		return true;
+
+	$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]);
 	}
-	# 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)) { # Don't save reply to self
+		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) {
@@ -1080,21 +1323,51 @@ function common_save_replies($notice) {
 			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]) {
+					$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::getForeignLink($notice->profile_id, 1); // 1 == Twitter
-	
-	if ($flink) {
-		if (!common_twitter_broadcast($notice, $flink)) {
-			common_debug('Unable to send notice: ' . $notice->id . ' to Twitter.', __FILE__);
+	$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);
@@ -1103,15 +1376,17 @@ function common_broadcast_notice($notice, $remote=false) {
 	}
 }
 
-function common_twitter_broadcast($notice, $flink) {	
+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';
-	$statustxt = $notice->content;
-	
+
+	// 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,
@@ -1127,27 +1402,27 @@ function common_twitter_broadcast($notice, $flink) {
 		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.", 
+		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	
+	// Twitter should return a status
 	$status = json_decode($data);
 
 	if (!$status->id) {
@@ -1155,8 +1430,8 @@ function common_twitter_broadcast($notice, $flink) {
 			__FILE__);
 		$success = false;
 	}
-	
-	return $status;
+
+	return $success;
 }
 
 # Stick the notice on the queue
@@ -1252,15 +1527,18 @@ function common_notice_form($action=NULL, $content=NULL) {
 	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('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',
@@ -1622,13 +1900,25 @@ function common_disfavor_form($notice) {
 									   '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' => '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' => '♥'));
+								  'value' => 'Disfavor favorite',
+								  'title' => 'Remove this message from favorites'));
 	common_element_end('form');
 }
 
@@ -1637,16 +1927,91 @@ function common_favor_form($notice) {
 									   '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' => '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' => '♡'));
+								  '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->nickname,
+									   'method' => 'post',
+									   'class' => 'subscribe',
+									   'action' => common_local_url('subscribe')));
+	common_hidden('token', common_session_token());
+	common_element('input', array('id' => 'subscribeto-' . $profile->nickname,
+								  'name' => 'subscribeto',
+								  'type' => 'hidden',
+								  'value' => $profile->nickname));
+	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->nickname,
+									   'method' => 'post',
+									   'class' => 'unsubscribe',
+									   'action' => common_local_url('unsubscribe')));
+	common_hidden('token', common_session_token());
+	common_element('input', array('id' => 'unsubscribeto-' . $profile->nickname,
+								  'name' => 'unsubscribeto',
+								  'type' => 'hidden',
+								  'value' => $profile->nickname));
+	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;
 }
@@ -1656,3 +2021,63 @@ function common_keyize($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;
+	}
+}