X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=4d670edcc157a059aa84edcc67247e9529b3fde4;hb=17fd7b185054e260f0a9a2cedd264ff3ef43d725;hp=44ed185fe44c8e8e4a8bcb7289daaedd08ae00a9;hpb=48c2d39ae4ec3d9116f4e316726b221e02f09f4b;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 44ed185fe4..4d670edcc1 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -131,17 +131,24 @@ function common_end_xml() {
 	$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
-	putenv('LANGUAGE='.$language);
-	putenv('LANG='.$language);
-	$locale_set = setlocale(LC_ALL, $language . ".utf8",
-							$language . ".UTF8",
-							$language . ".utf-8",
-							$language . ".UTF-8",
-							$language);
+ 	$locale_set = common_init_locale($language);
 	bindtextdomain("laconica", common_config('site','locale_path'));
 	bind_textdomain_codeset("laconica", "UTF-8");
 	textdomain("laconica");
@@ -154,11 +161,12 @@ function common_init_language() {
 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']);
@@ -202,7 +210,7 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 		}
 	}
 	common_element_end('head');
-	common_element_start('body');
+	common_element_start('body', $action);
 	common_element_start('div', array('id' => 'wrap'));
 	common_element_start('div', array('id' => 'header'));
 	common_nav_menu();
@@ -236,21 +244,21 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 }
 
 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',
@@ -401,9 +409,8 @@ function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value
 		$attrs['disabled'] = 'true';
 	}
 	common_element('input', $attrs);
-	# XXX: use a <label>
 	common_text(' ');
-	common_element('span', 'checkbox_label', $label);
+	common_element('label', array('class' => 'checkbox_label', 'for' => $id), $label);
 	common_text(' ');
 	if ($instructions) {
 		common_element('span', 'input_instructions', $instructions);
@@ -557,8 +564,16 @@ function common_ensure_session() {
 # 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)) {
@@ -571,7 +586,8 @@ function common_set_user($user) {
 	if ($user) {
 		common_ensure_session();
 		$_SESSION['userid'] = $user->id;
-		return $user;
+        $_cur = $user;
+		return $_cur;
 	}
 	return false;
 }
@@ -593,7 +609,7 @@ function common_set_cookie($key, $value, $expiration=0) {
 }
 
 define('REMEMBERME', 'rememberme');
-define('REMEMBERME_EXPIRY', 30 * 24 * 60 * 60);
+define('REMEMBERME_EXPIRY', 30 * 24 * 60 * 60); # 30 days
 
 function common_rememberme($user=NULL) {
 	if (!$user) {
@@ -603,50 +619,97 @@ function common_rememberme($user=NULL) {
 			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;
-	}
-	common_log(LOG_INFO, 'adding rememberme cookie for ' . $user->nickname);
-	common_set_cookie(REMEMBERME,
-					  implode(':', array($rm->user_id, $rm->code)),
-					  time() + REMEMBERME_EXPIRY);
+    }
+
+    $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;
-	# Try to remember
-	$packed = isset($_COOKIE[REMEMBERME]) ? $_COOKIE[REMEMBERME] : '';
-	if ($packed) {
-		list($id, $code) = explode(':', $packed);
-		if ($id && $code) {
-			$rm = Remember_me::staticGet($code);
-			if ($rm && ($rm->user_id == $id)) {
-				$user = User::staticGet($rm->user_id);
-				if ($user) {
-					# successful!
-					$result = $rm->delete();
-					if (!$result) {
-						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($user);
-					}
-				}
-			}
-		}
-	}
+
+	$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;
 }
 
@@ -658,23 +721,31 @@ function common_forgetme() {
 
 # who is the current user?
 function common_current_user() {
-	if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
-		common_ensure_session();
-		$id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false;
-		if ($id) {
-			# note: this should cache
-			$user = User::staticGet($id);
-			return $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;
+    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
@@ -754,11 +825,17 @@ function common_render_uri_thingy($matches) {
 		$title = " title='$longurl'";
 	}
 	else $title = '';
-	
+
 	return '<a href="' . $uri . '"' . $title . ' class="extlink">' . $uri . '</a>' . $trailer;
 }
 
-function common_longurl($uri)  {
+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;
@@ -766,73 +843,77 @@ function common_longurl($uri)  {
 }
 
 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)
-	// 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);
+	return $cache[$text] = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $text);
 }
 
-function common_shorten_link($long_url) {
-	
+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($long_url);
+            $short_url = $short_url_service->shorten($url);
             break;
-            
+
         case '2tu.us':
             $short_url_service = new TightUrl;
-            $short_url = $short_url_service->shorten($long_url);
+            $short_url = $short_url_service->shorten($url);
             break;
-            
+
         case 'ptiturl.com':
             $short_url_service = new PtitUrl;
-            $short_url = $short_url_service->shorten($long_url);
+            $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($long_url));
+			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($long_url));
+			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($long_url));
+			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($long_url));
+			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($long_url));
+			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) {
-		return $short_url;
+        $url_cache[(string)$short_url] = $url;
+		return (string)$short_url;
 	}
-	return $long_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);
 }
@@ -843,7 +924,7 @@ function common_tag_link($tag) {
 	return '<a href="' . htmlspecialchars($url) . '" rel="tag" class="hashlink">' . htmlspecialchars($tag) . '</a>';
 }
 
-function common_canonical_tag($tag) {  
+function common_canonical_tag($tag) {
 	return strtolower(str_replace(array('-', '_', '.'), '', $tag));
 }
 
@@ -855,9 +936,9 @@ 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>';
+		return '<span class="vcard"><a class="fn nickname url" rel="reply" href="'.htmlspecialchars($recipient->profileurl).'" class="atlink">'.$nickname.'</a></span>';
 	} else {
-		return $nickname;
+		return '<span class="vcard"> <span class="fn nickname">'.$nickname.'</span> </span>';
 	}
 }
 
@@ -984,6 +1065,8 @@ function common_fancy_url($action, $args=NULL) {
 		}
 	 case 'publicrss':
 		return common_path('rss');
+	 case 'publicatom':
+		return common_path("api/statuses/public_timeline.atom");
 	 case 'publicxrds':
 		return common_path('xrds');
 	 case 'featuredrss':
@@ -998,6 +1081,7 @@ function common_fancy_url($action, $args=NULL) {
                 }
 	 case 'doc':
 		return common_path('doc/'.$args['title']);
+     case 'block':
 	 case 'login':
 	 case 'logout':
 	 case 'subscribe':
@@ -1034,6 +1118,8 @@ function common_fancy_url($action, $args=NULL) {
 		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']);
@@ -1048,6 +1134,7 @@ 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);
@@ -1079,6 +1166,8 @@ function common_fancy_url($action, $args=NULL) {
 	 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'])) {
@@ -1147,11 +1236,11 @@ function common_fancy_url($action, $args=NULL) {
 			 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');
+				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);
@@ -1285,19 +1374,19 @@ function common_save_replies($notice) {
 	$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);
@@ -1313,6 +1402,11 @@ function common_save_replies($notice) {
 				$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;
@@ -1326,24 +1420,31 @@ function common_save_replies($notice) {
 			$replied[$recipient->id] = 1;
 		}
 	}
+
 	# Hash format replies, too
 	$cnt = preg_match_all('/(?:^|\s)@#([a-z0-9]{1,64})/', $notice->content, $match);
-	foreach ($match 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;
+	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) {
@@ -1675,7 +1776,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
 
 		common_element_start('li', 'before');
-		common_element('a', array('href' => common_local_url($action, $newargs)),
+		common_element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
 					   _('« After'));
 		common_element_end('li');
 	}
@@ -1684,7 +1785,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 		$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)),
+		common_element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
 						   _('Before »'));
 		common_element_end('li');
 	}
@@ -1936,7 +2037,7 @@ function common_favor_form($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,
@@ -1960,15 +2061,15 @@ function common_nudge_response() {
 }
 
 function common_subscribe_form($profile) {
-	common_element_start('form', array('id' => 'subscribe-' . $profile->nickname,
+	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->nickname,
+	common_element('input', array('id' => 'subscribeto-' . $profile->id,
 								  'name' => 'subscribeto',
 								  'type' => 'hidden',
-								  'value' => $profile->nickname));
+								  'value' => $profile->id));
 	common_element('input', array('type' => 'submit',
 								  'class' => 'submit',
 								  'value' => _('Subscribe')));
@@ -1981,10 +2082,10 @@ function common_unsubscribe_form($profile) {
 									   'class' => 'unsubscribe',
 									   'action' => common_local_url('unsubscribe')));
 	common_hidden('token', common_session_token());
-	common_element('input', array('id' => 'unsubscribeto-' . $profile->nickname,
+	common_element('input', array('id' => 'unsubscribeto-' . $profile->id,
 								  'name' => 'unsubscribeto',
 								  'type' => 'hidden',
-								  'value' => $profile->nickname));
+								  'value' => $profile->id));
 	common_element('input', array('type' => 'submit',
 								  'class' => 'submit',
 								  'value' => _('Unsubscribe')));
@@ -2000,7 +2101,7 @@ function common_profile_new_message_nudge ($cur, $profile) {
 		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);
@@ -2020,41 +2121,41 @@ function common_keyize($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');
 }
@@ -2078,3 +2179,31 @@ function common_memcache() {
 		return $cache;
 	}
 }
+
+function common_compatible_license($from, $to) {
+	# XXX: better compatibility check needed here!
+	return ($from == $to);
+}
+
+function common_block_form($profile, $args=NULL) {
+    common_element_start('form', array('id' => 'block-' . $profile->id,
+                                       'method' => 'post',
+                                       'class' => 'block',
+                                       'action' => common_local_url('block')));
+    common_hidden('token', common_session_token());
+    common_element('input', array('id' => 'blockto-' . $profile->id,
+                                  'name' => 'blockto',
+                                  'type' => 'hidden',
+                                  'value' => $profile->id));
+    common_element('input', array('type' => 'submit',
+                                  'class' => 'submit',
+                                  'name' => 'block',
+                                  'value' => _('Block')));
+    if ($args) {
+        foreach ($args as $k => $v) {
+            common_hidden('returnto-' . $k, $v);
+        }
+    }
+    common_element_end('form');
+    return;
+}