X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=7f9b237249dddd0ec4dcbc3ff37996859eaaee75;hb=67921b1c1871e881f71f8f15aa7fc9c2b11da64d;hp=f431c64ecbea74d824d5687f2892bbdfbb9f0a58;hpb=2b842b5e452c71a390a8cd005daad797a88cef55;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index f431c64ecb..f4245693fb 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -93,14 +93,22 @@ 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;
-	$xw->endElement();
+	# 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);
+	common_element_start($tag, $attrs);
+	global $xw;
 	if ($content) {
-		global $xw;
 		$xw->text($content);
 	}
 	common_element_end($tag);
@@ -123,10 +131,24 @@ function common_end_xml() {
 	$xw->flush();
 }
 
-function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
+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;
 
-	header('Content-Type: application/xhtml+xml');
+	$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',
@@ -143,16 +165,23 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
 				   $pagetitle . " - " . $config['site']['name']);
 	common_element('link', array('rel' => 'stylesheet',
 								 'type' => 'text/css',
-								 'href' => common_path('theme/default/style/html.css'),
-								 'media' => 'screen, projection, tv'));
-	common_element('link', array('rel' => 'stylesheet',
-								 'type' => 'text/css',
-								 'href' => common_path('theme/default/style/layout.css'),
+								 'href' => theme_path('display.css'),
 								 'media' => 'screen, projection, tv'));
-	common_element('link', array('rel' => 'stylesheet',
-								 'type' => 'text/css',
-								 'href' => common_path('theme/default/style/print.css'),
-								 'media' => 'print'));
+	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]');
+		}
+	}
+
+	common_element('script', array('type' => 'text/javascript',
+								   'src' => common_path('js/jquery.min.js')),
+				   ' ');
+	common_element('script', array('type' => 'text/javascript',
+								   'src' => common_path('js/util.js')),
+				   ' ');
+
 	if ($callable) {
 		if ($data) {
 			call_user_func($callable, $data);
@@ -162,23 +191,68 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
 	}
 	common_element_end('head');
 	common_element_start('body');
-	common_element_start('div', array('id' => 'wrapper'));
-	common_element_start('div', array('id' => 'content'));
+	common_element_start('div', array('id' => 'wrap'));
 	common_element_start('div', array('id' => 'header'));
-	common_element('h1', 'title', $pagetitle);
-	common_element('h2', 'subtitle', $config['site']['name']);
+	common_nav_menu();
+	if ((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']) ?
+									($config['site']['logo']) : theme_path('logo.png'),
+									'alt' => $config['site']['name'],
+									'id' => 'logo'));
+		common_element_end('a');
+	} else {
+		common_element_start('p', array('id' => 'branding'));
+		common_element('a', array('href' => common_local_url('public')),
+					   $config['site']['name']);
+		common_element_end('p');
+	}
+
+	common_element('h1', 'pagetitle', $pagetitle);
+
+	if ($headercall) {
+		if ($data) {
+			call_user_func($headercall, $data);
+		} else {
+			call_user_func($headercall);
+		}
+	}
 	common_element_end('div');
-	common_head_menu();
-	common_element_start('div', array('id' => 'page'));
+	common_element_start('div', array('id' => 'content'));
 }
 
 function common_show_footer() {
 	global $xw, $config;
-	common_element_start('div', 'footer');
+	common_element_end('div'); # content div
 	common_foot_menu();
-	common_license_block();
-	common_element_end('div');
+	common_element_start('div', array('id' => 'footer'));
+	common_element_start('div', 'laconica');
+	if (common_config('site', 'broughtby')) {
+		$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+	} else {
+		$instr = _('**%%site.name%%** is a microblogging service. ');
+	}
+	$instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) ' .
+		         'microblogging software, version %s, ' .
+		         'available under the ' .
+		         '[GNU Affero General Public License]' .
+		         '(http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
+    $output = common_markup_to_html($instr);
+    common_raw($output);
 	common_element_end('div');
+	common_element('img', array('id' => 'cc',
+								'src' => $config['license']['image'],
+								'alt' => $config['license']['title']));
+	common_element_start('p');
+	common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+	common_element('a', array('class' => 'license',
+							  'rel' => 'license',
+							  href => $config['license']['url']),
+				   $config['license']['title']);
+	common_text(_('. Contributors should be attributed by full name or nickname.'));
+	common_element_end('p');
 	common_element_end('div');
 	common_element_end('div');
 	common_element_end('body');
@@ -196,86 +270,96 @@ function common_raw($xml) {
 	$xw->writeRaw($xml);
 }
 
-function common_license_block() {
-	global $config, $xw;
-	common_element_start('p', 'license greenBg');
-	common_element_start('span', 'floatLeft width25');
-	common_element_start('a', array('class' => 'license',
-									'rel' => 'license',
-									href => $config['license']['url']));
-	common_element('img', array('class' => 'license',
-								'src' => $config['license']['image'],
-								'alt' => $config['license']['title']));
-	common_element_end('a');
-	common_element_end('span');
-	common_element_start('span', 'floatRight width75');
-	common_text(_t('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
-	common_element('a', array('class' => 'license',
-							  'rel' => 'license',
-							  href => $config['license']['url']),
-				   $config['license']['title']);
-	common_text(_t('. Contributors should be attributed by full name or nickname.'));
-	common_element_end('span');
-	common_element_end('p');
-}
-
-function common_head_menu() {
+function common_nav_menu() {
 	$user = common_current_user();
-	common_element_start('ul', array('id' => 'menu', 'class' => ($user) ? 'five' : 'three'));
+	common_element_start('ul', array('id' => 'nav'));
+	if ($user) {
+		common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
+						 _('Home'));
+	}
 	common_menu_item(common_local_url('public'), _t('Public'));
+	common_menu_item(common_local_url('doc', array('title' => 'help')),
+					 _('Help'));
 	if ($user) {
-		common_menu_item(common_local_url('all', array('nickname' =>
-													   $user->nickname)),
-						 _t('Home'));
-		common_menu_item(common_local_url('showstream', array('nickname' =>
-															  $user->nickname)),
-						 _t('Profile'),  $user->fullname || $user->nickname);
 		common_menu_item(common_local_url('profilesettings'),
-						 _t('Settings'));
+						 _('Settings'));
 		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('login'), _('Login'));
+		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', 'footmenu menuish');
+	common_element_start('ul', array('id' => 'nav_sub'));
 	common_menu_item(common_local_url('doc', array('title' => 'about')),
-					 _t('About'));
-	common_menu_item(common_local_url('doc', array('title' => 'help')),
-					 _t('Help'));
+					 _('About'));
+	common_menu_item(common_local_url('doc', array('title' => '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')),
+					 _('Contact'));
 	common_element_end('ul');
 }
 
-function common_menu_item($url, $text, $title=NULL) {
+function common_menu_item($url, $text, $title=NULL, $is_selected=false) {
+	$lattrs = array();
+	if ($is_selected) {
+		$lattrs['class'] = 'current';
+	}
+	common_element_start('li', $lattrs);
 	$attrs['href'] = $url;
 	if ($title) {
 		$attrs['title'] = $title;
 	}
-	common_element_start('li', 'menuitem');
 	common_element('a', $attrs, $text);
 	common_element_end('li');
 }
 
-function common_input($id, $label, $value=NULL) {
+function common_input($id, $label, $value=NULL,$instructions=NULL) {
 	common_element_start('p');
 	common_element('label', array('for' => $id), $label);
 	$attrs = array('name' => $id,
 				   'type' => 'text',
+				   'class' => 'input_text',
+				   'id' => $id);
+	if ($value) {
+		$attrs['value'] = htmlspecialchars($value);
+	}
+	common_element('input', $attrs);
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
+	common_element_end('p');
+}
+
+function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value='true')
+{
+	common_element_start('p');
+	$attrs = array('name' => $id,
+				   'type' => 'checkbox',
+				   'class' => 'checkbox',
 				   'id' => $id);
 	if ($value) {
 		$attrs['value'] = htmlspecialchars($value);
 	}
+	if ($checked) {
+		$attrs['checked'] = 'checked';
+	}
 	common_element('input', $attrs);
+	# XXX: use a <label>
+	common_text(' ');
+	common_element('span', 'checkbox_label', $label);
+	common_text(' ');
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
 	common_element_end('p');
 }
 
@@ -286,46 +370,49 @@ function common_hidden($id, $value) {
 								  'value' => $value));
 }
 
-function common_password($id, $label) {
+function common_password($id, $label, $instructions=NULL) {
 	common_element_start('p');
 	common_element('label', array('for' => $id), $label);
 	$attrs = array('name' => $id,
 				   'type' => 'password',
+				   'class' => 'password',
 				   'id' => $id);
 	common_element('input', $attrs);
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
 	common_element_end('p');
 }
 
 function common_submit($id, $label) {
 	global $xw;
 	common_element_start('p');
-	common_element_start('label', array('for' => $id));
-	$xw->writeRaw('&nbsp;');
-	common_element_end('label');
 	common_element('input', array('type' => 'submit',
 								  'id' => $id,
 								  'name' => $id,
-								  'value' => $label,
-								  'class' => 'button'));
+								  'class' => 'submit',
+								  'value' => $label));
 	common_element_end('p');
 }
 
-function common_textarea($id, $label, $content=NULL) {
+function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
 	common_element_start('p');
 	common_element('label', array('for' => $id), $label);
 	common_element('textarea', array('rows' => 3,
 									 'cols' => 40,
 									 'name' => $id,
-									 'id' => $id,
-									 'class' => 'width50'),
-				   ($content) ? $content : ' ');
+									 'id' => $id),
+				   ($content) ? $content : '');
+	if ($instructions) {
+		common_element('span', 'input_instructions', $instructions);
+	}
 	common_element_end('p');
 }
 
 # salted, hashed passwords are stored in the DB
 
-function common_munge_password($id, $password) {
-	return md5($id . $password);
+function common_munge_password($password, $id) {
+	return md5($password . $id);
 }
 
 # check if a username exists and has matching password
@@ -334,8 +421,12 @@ function common_check_user($nickname, $password) {
 	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;
+		}
 	}
 }
 
@@ -354,40 +445,143 @@ 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 {
+	} else if (!($user instanceof User)) {
+		return false;
+	}
+	
+	if ($user) {
+		common_ensure_session();
+		$_SESSION['userid'] = $user->id;
+		return $user;
+	}
+	return false;
+}
+
+function common_set_cookie($key, $value, $expiration=0) {
+	$path = common_config('site', 'path');
+	$server = common_config('site', 'server');
+
+	if ($path && ($path != '/')) {
+		$cookiepath = '/' . $path . '/';
+	} else {
+		$cookiepath = '/';
+	}
+	return setcookie($key,
+	                 $value,
+	          		 $expiration,
+			  		 $cookiepath,
+			  	     $server);
+}
+
+define('REMEMBERME', 'rememberme');
+define('REMEMBERME_EXPIRY', 30 * 24 * 60 * 60);
+
+function common_rememberme($user=NULL) {
+	if (!$user) {
+		$user = common_current_user();
+		if (!$user) {
+			common_debug('No current user to remember', __FILE__);
 			return false;
 		}
 	}
-	return false;
+	$rm = new Remember_me();
+	$rm->code = common_good_rand(16);
+	$rm->user_id = $user->id;
+	$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];
+	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);
+					}
+				}
+			}
+		}
+	}
+	return $user;
+}
+
+# must be called with a valid user!
+
+function common_forgetme() {
+	common_set_cookie(REMEMBERME, '', 0);
 }
 
 # who is the current user?
 function common_current_user() {
-	static $user = NULL; # FIXME: global memcached
-	if (is_null($user)) {
+	if ($_REQUEST[session_name()]) {
 		common_ensure_session();
 		$id = $_SESSION['userid'];
 		if ($id) {
+			# note: this should cache
 			$user = User::staticGet($id);
+			return $user;
 		}
 	}
+	# that didn't work; try to remember
+	$user = common_remembered_user();
 	return $user;
 }
 
+# Logins that are 'remembered' aren't 'real' -- they're subject to
+# cookie-stealing. So, we don't let them do certain things. New reg,
+# OpenID, and password logins _are_ real.
+
+function common_real_login($real=true) {
+	common_ensure_session();
+	$_SESSION['real_login'] = $real;
+}
+
+function common_is_real_login() {
+	return common_logged_in() && $_SESSION['real_login'];
+}
+
 # get canonical version of nickname for comparison
 function common_canonical_nickname($nickname) {
 	# XXX: UTF-8 canonicalization (like combining chars)
-	return $nickname;
+	return strtolower($nickname);
 }
 
 # get canonical version of email for comparison
@@ -403,42 +597,55 @@ function common_render_content($text, $notice) {
 	$r = htmlspecialchars($text);
 	$id = $notice->profile_id;
 	$r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
-	$r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
+	$r = preg_replace('/(^|\s+)@([a-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
 	# XXX: # tags
 	# XXX: machine tags
 	return $r;
 }
 
 function common_at_link($sender_id, $nickname) {
+	$sender = Profile::staticGet($sender_id);
+	$recipient = common_relative_profile($sender, $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
+	# 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
+	# 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) {
-			$recipient = $recipient->getProfile();
-			return '<a href="'.htmlspecialchars($recipient->profileurl).'" 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?
@@ -462,13 +669,20 @@ function common_avatar_url($filename) {
 	return common_path('avatar/'.$filename);
 }
 
+function common_avatar_display_url($avatar) {
+	$server = common_config('avatar', 'server');
+	if ($server) {
+		return 'http://'.$server.'/'.$avatar->filename;
+	} else {
+		return $avatar->url;
+	}
+}
+
 function common_default_avatar($size) {
 	static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
 							  AVATAR_STREAM_SIZE => 'stream',
 							  AVATAR_MINI_SIZE => 'mini');
-	global $config;
-
-	return common_path($config['avatar']['default'][$sizenames[$size]]);
+	return theme_path('default-avatar-'.$sizenames[$size].'.png');
 }
 
 function common_local_url($action, $args=NULL) {
@@ -482,6 +696,91 @@ function common_local_url($action, $args=NULL) {
 
 function common_fancy_url($action, $args=NULL) {
 	switch (strtolower($action)) {
+	 case 'public':
+		if ($args && $args['page']) {
+			return common_path('?page=' . $args['page']);
+		} else {
+			return common_path('');
+		}
+	 case 'publicrss':
+		return common_path('rss');
+	 case 'publicxrds':
+		return common_path('xrds');
+	 case 'doc':
+		return common_path('doc/'.$args['title']);
+	 case 'login':
+	 case 'logout':
+	 case 'register':
+	 case 'subscribe':
+	 case 'unsubscribe':
+		return common_path('main/'.$action);
+	 case 'remotesubscribe':
+		if ($args && $args['nickname']) {
+			return common_path('main/remote?nickname=' . $args['nickname']);
+		} else {
+			return common_path('main/remote');
+		}
+	 case 'openidlogin':
+		return common_path('main/openid');
+	 case 'avatar':
+	 case 'password':
+		return common_path('settings/'.$action);
+	 case 'profilesettings':
+		return common_path('settings/profile');
+	 case 'openidsettings':
+		return common_path('settings/openid');
+	 case 'newnotice':
+		if ($args && $args['replyto']) {
+			return common_path('notice/new?replyto='.$args['replyto']);
+		} else {
+			return common_path('notice/new');
+		}
+	 case 'shownotice':
+		return common_path('notice/'.$args['notice']);
+	 case 'xrds':
+	 case 'foaf':
+		return common_path($args['nickname'].'/'.$action);
+	 case 'subscriptions':
+	 case 'subscribers':
+	 case 'all':
+	 case 'replies':
+		if ($args && $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']) {
+			return common_path($args['nickname'].'?page=' . $args['page']);
+		} else {
+			return common_path($args['nickname']);
+		}
+	 case 'confirmaddress':
+		return common_path('main/confirmaddress/'.$args['code']);
+	 case 'userbyid':
+	 	return common_path('user/'.$args['id']);
+	 case 'recoverpassword':
+	    $path = 'main/recoverpassword';
+	    if ($args['code']) {
+	    	$path .= '/' . $args['code'];
+		}
+	    return common_path($path);
+	 case 'imsettings':
+	 	return common_path('settings/im');
+	 case 'peoplesearch':
+		return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'noticesearch':
+		return common_path('search/notice' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'noticesearchrss':
+		return common_path('search/notice/rss' . (($args) ? ('?' . http_build_query($args)) : ''));
+	 case 'avatarbynickname':
+		return common_path($args['nickname'].'/avatar/'.$args['size']);
 	 default:
 		return common_simple_url($action, $args);
 	}
@@ -508,7 +807,40 @@ function common_path($relative) {
 function common_date_string($dt) {
 	// XXX: do some sexy date formatting
 	// return date(DATE_RFC822, $dt);
-	return $dt;
+	$t = strtotime($dt);
+	$now = time();
+	$diff = $now - $t;
+
+	if ($now < $t) { # that shouldn't happen!
+		return common_exact_date($dt);
+	} else if ($diff < 60) {
+		return _('a few seconds ago');
+	} else if ($diff < 92) {
+		return _('about a minute ago');
+	} else if ($diff < 3300) {
+		return sprintf(_('about %d minutes ago'), round($diff/60));
+	} else if ($diff < 5400) {
+		return _('about an hour ago');
+	} else if ($diff < 22 * 3600) {
+		return sprintf(_('about %d hours ago'), round($diff/3600));
+	} else if ($diff < 37 * 3600) {
+		return _('about a day ago');
+	} else if ($diff < 24 * 24 * 3600) {
+		return sprintf(_('about %d days ago'), round($diff/(24*3600)));
+	} else if ($diff < 46 * 24 * 3600) {
+		return _('about a month ago');
+	} else if ($diff < 330 * 24 * 3600) {
+		return sprintf(_('about %d months ago'), round($diff/(30*24*3600)));
+	} else if ($diff < 480 * 24 * 3600) {
+		return _('about a year ago');
+	} else {
+		return common_exact_date($dt);
+	}
+}
+
+function common_exact_date($dt) {
+	$t = strtotime($dt);
+	return date(DATE_RFC850, $t);
 }
 
 function common_date_w3dtf($dt) {
@@ -523,90 +855,134 @@ function common_redirect($url, $code=307) {
 						   307 => "Temporary Redirect");
 	header("Status: ${code} $status[$code]");
 	header("Location: $url");
+
+	common_start_xml('a',
+					 '-//W3C//DTD XHTML 1.0 Strict//EN',
+					 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
 	common_element('a', array('href' => $url), $url);
+	common_end_xml();
+}
+
+function common_save_replies($notice) {
+	# extract all @messages
+	$cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $notice->content, $match);
+	if (!$cnt) {
+		return true;
+	}
+	$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($match[1]); $i++) {
+		$nickname = $match[1][$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
+			$reply_for = $recipient;
+			$recipient_notice = $reply_for->getCurrentNotice();
+			$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_ERROR, 'DB error inserting reply: ' . $last_error->message);
+			common_server_error(_('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
-	if (!$remote) {
-		common_broadcast_remote_subscribers($notice);
+	if (common_config('queue', 'enabled')) {
+		# Do it later!
+		return common_enqueue_notice($notice);
+	} else {
+		return common_real_broadcast($notice, $remote);
 	}
-	// XXX: broadcast notices to Jabber
-	// XXX: broadcast notices to SMS
-	// XXX: broadcast notices to other IM
-	return true;
 }
 
-function common_broadcast_remote_subscribers($notice) {
-	# First, get remote users subscribed to this profile
-	$sub = new Subscription();
-	$sub->subscribed = $notice->profile_id;
-	$rp = new Remote_profile();
-	$sub->addJoin($rp, 'INNER', NULL, 'subscriber');
-	if ($sub->find()) {
-		$posted = array();
-		while ($sub->fetch()) {
-			if (!$posted[$rp->postnoticeurl]) {
-				if (common_post_notice($notice, $rp, $sub)) {
-					$posted[$rp->postnoticeurl] = TRUE;
-				}
-			}
-		}
+# Stick the notice on the queue
+
+function common_enqueue_notice($notice) {
+	$qi = new Queue_item();
+	$qi->notice_id = $notice->id;
+	$qi->created = $notice->created;
+        $result = $qi->insert();
+	if (!$result) {
+	    $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+	    common_log(LOG_ERROR, 'DB error inserting queue item: ' . $last_error->message);
+	    return false;
 	}
+	common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id);
+	return $result;
 }
 
-function common_post_notice($notice, $remote_profile, $subscription) {
-	global $config; # for license URL
-	$user = User::staticGet('id', $notice->profile_id);
-	$con = omb_oauth_consumer();
-	$token = new OAuthToken($subscription->token, $subscription->secret);
-	$url = $remote_profile->postnoticeurl;
-	$parsed = parse_url($url);
-	$params = array();
-	parse_str($parsed['query'], $params);
-	$req = OAuthRequest::from_consumer_and_token($con, $token,
-												 "POST", $url, $params);
-	$req->set_parameter('omb_version', OMB_VERSION_01);
-	$req->set_parameter('omb_listenee', $user->uri);
-	$req->set_parameter('omb_notice', $notice->uri);
-	$req->set_parameter('omb_notice_content', $notice->content);
-	$req->set_parameter('omb_notice_url', common_local_url('shownotice',
-														   array('notice' =>
-																 $notice->id)));
-	$req->set_parameter('omb_notice_license', $config['license']['url']);
-	$req->sign_request(omb_hmac_sha1(), $con, $tok);
-
-	# We re-use this tool's fetcher, since it's pretty good
-
-	$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
-
-	$result = $fetcher->post($req->get_normalized_http_url(),
-							 $req->to_postdata());
-
-	if ($result->status == 403) { # not authorized, don't send again
-		$subscription->delete();
-		return false;
-	} else if ($result->status != 200) {
-		return false;
-	} else { # success!
-		parse_str($result->body, $return);
-		if ($return['omb_version'] == OMB_VERSION_01) {
-			return true;
-		} else {
-			return false;
+function common_real_broadcast($notice, $remote=false) {
+	$success = true;
+	if (!$remote) {
+		# Make sure we have the OMB stuff
+		require_once(INSTALLDIR.'/lib/omb.php');
+		$success = omb_broadcast_remote_subscribers($notice);
+		if (!$success) {
+			common_log(LOG_ERROR, '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_ERROR, 'Error in jabber broadcast for notice ' . $notice->id);
+		}
+	}
+	// XXX: broadcast notices to SMS
+	// XXX: broadcast notices to other IM
+	return $success;
+}
+
+function common_broadcast_profile($profile) {
+	// XXX: optionally use a queue system like http://code.google.com/p/microapps/wiki/NQDQ
+	require_once(INSTALLDIR.'/lib/omb.php');
+	omb_broadcast_profile($profile);
+	// XXX: Other broadcasts...?
+	return true;
 }
 
 function common_profile_url($nickname) {
 	return common_local_url('showstream', array('nickname' => $nickname));
 }
 
-function common_notice_form() {
-	common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
+# Don't call if nobody's logged in
+
+function common_notice_form($action=NULL, $content=NULL) {
+	$user = common_current_user();
+	assert(!is_null($user));
+	common_element_start('form', array('id' => 'status_form',
+									   'method' => 'post',
 									   'action' => common_local_url('newnotice')));
-	common_textarea('noticecontent', _t('What\'s up?'));
-	common_submit('submit', _t('Send'));
+	common_element_start('p');
+	common_element('label', array('for' => 'status_textarea',
+								  'id' => 'status_label'),
+				   sprintf(_('What\'s up, %s?'), $user->nickname));
+        common_element('span', array('id' => 'counter', 'class' => 'counter'), '140');
+	common_element('textarea', array('id' => 'status_textarea',
+									 'cols' => 60,
+									 'rows' => 3,
+									 'name' => 'status_textarea'),
+				   ($content) ? $content : '');
+	if ($action) {
+		common_hidden('returnto', $action);
+	}
+	common_element('input', array('id' => 'status_submit',
+								  'name' => 'status_submit',
+								  'type' => 'submit',
+								  'value' => _('Send')));
+	common_element_end('p');
 	common_element_end('form');
 }
 
@@ -669,12 +1045,6 @@ function common_timestamp() {
 	return date('YmdHis');
 }
 
-// XXX: set up gettext
-
-function _t($str) {
-	return $str;
-}
-
 function common_ensure_syslog() {
 	static $initialized = false;
 	if (!$initialized) {
@@ -686,8 +1056,20 @@ function common_ensure_syslog() {
 }
 
 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) {
@@ -698,6 +1080,25 @@ 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_ERR, $last_error->message . '(' . $verb . ' on ' . $objstr . ')', $filename);
+}
+
+function common_log_objstring(&$object) {
+	if (is_null($object)) {
+		return "NULL";
+	}
+	$arr = $object->toArray();
+	$fields = array();
+	foreach ($arr as $k => $v) {
+		$fields[] = "$k='$v'";
+	}
+	$objstring = $object->tableName() . '[' . implode(',', $fields) . ']';
+	return $objstring;
+}
+
 function common_valid_http_url($url) {
 	return Validate::uri($url, array('allowed_schemes' => array('http', 'https')));
 }
@@ -709,3 +1110,164 @@ function common_valid_tag($tag) {
 	}
 	return false;
 }
+
+# Does a little before-after block for next/prev page
+
+function common_pagination($have_before, $have_after, $page, $action, $args=NULL) {
+
+	if ($have_before || $have_after) {
+		common_element_start('div', array('id' => 'pagination'));
+		common_element_start('ul', array('id' => 'nav_pagination'));
+	}
+
+	if ($have_before) {
+		$pargs = array('page' => $page-1);
+		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+
+		common_element_start('li', 'before');
+		common_element('a', array('href' => common_local_url($action, $newargs)),
+					   _('« After'));
+		common_element_end('li');
+	}
+
+	if ($have_after) {
+		$pargs = array('page' => $page+1);
+		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+		common_element_start('li', 'after');
+		common_element('a', array('href' => common_local_url($action, $newargs)),
+						   _('Before »'));
+		common_element_end('li');
+	}
+
+	if ($have_before || $have_after) {
+		common_element_end('ul');
+		common_element_end('div');
+	}
+}
+
+/* Following functions are copied from MediaWiki GlobalFunctions.php
+ * and written by Evan Prodromou. */
+
+function common_accept_to_prefs($accept, $def = '*/*') {
+	# No arg means accept anything (per HTTP spec)
+	if(!$accept) {
+		return array($def => 1);
+	}
+
+	$prefs = array();
+
+	$parts = explode(',', $accept);
+
+	foreach($parts as $part) {
+		# FIXME: doesn't deal with params like 'text/html; level=1'
+		@list($value, $qpart) = explode(';', $part);
+		$match = array();
+		if(!isset($qpart)) {
+			$prefs[$value] = 1;
+		} elseif(preg_match('/q\s*=\s*(\d*\.\d+)/', $qpart, $match)) {
+			$prefs[$value] = $match[1];
+		}
+	}
+
+	return $prefs;
+}
+
+function common_mime_type_match($type, $avail) {
+	if(array_key_exists($type, $avail)) {
+		return $type;
+	} else {
+		$parts = explode('/', $type);
+		if(array_key_exists($parts[0] . '/*', $avail)) {
+			return $parts[0] . '/*';
+		} elseif(array_key_exists('*/*', $avail)) {
+			return '*/*';
+		} else {
+			return NULL;
+		}
+	}
+}
+
+function common_negotiate_type($cprefs, $sprefs) {
+	$combine = array();
+
+	foreach(array_keys($sprefs) as $type) {
+		$parts = explode('/', $type);
+		if($parts[1] != '*') {
+			$ckey = common_mime_type_match($type, $cprefs);
+			if($ckey) {
+				$combine[$type] = $sprefs[$type] * $cprefs[$ckey];
+			}
+		}
+	}
+
+	foreach(array_keys($cprefs) as $type) {
+		$parts = explode('/', $type);
+		if($parts[1] != '*' && !array_key_exists($type, $sprefs)) {
+			$skey = common_mime_type_match($type, $sprefs);
+			if($skey) {
+				$combine[$type] = $sprefs[$skey] * $cprefs[$type];
+			}
+		}
+	}
+
+	$bestq = 0;
+	$besttype = "text/html";
+
+	foreach(array_keys($combine) as $type) {
+		if($combine[$type] > $bestq) {
+			$besttype = $type;
+			$bestq = $combine[$type];
+		}
+	}
+
+	return $besttype;
+}
+
+function common_config($main, $sub) {
+	global $config;
+	return $config[$main][$sub];
+}
+
+function common_copy_args($from) {
+	$to = array();
+	$strip = get_magic_quotes_gpc();
+	foreach ($from as $k => $v) {
+		$to[$k] = ($strip) ? stripslashes($v) : $v;
+	}
+	return $to;
+}
+
+function common_user_uri(&$user) {
+	return common_local_url('userbyid', array('id' => $user->id));
+}
+
+function common_notice_uri(&$notice) {
+	return common_local_url('shownotice',
+		array('notice' => $notice->id));
+}
+
+# 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
+
+function common_confirmation_code($bits) {
+	# 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
+	static $codechars = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
+	$chars = ceil($bits/5);
+	$code = '';
+	for ($i = 0; $i < $chars; $i++) {
+		# XXX: convert to string and back
+		$num = hexdec(common_good_rand(1));
+		# XXX: randomness is too precious to throw away almost
+		# 40% of the bits we get!
+		$code .= $codechars[$num%32];
+	}
+	return $code;
+}
+
+# convert markup to HTML
+
+function common_markup_to_html($c) {
+	$c = preg_replace('/%%action.(\w+)%%/e', "common_local_url('\\1')", $c);
+	$c = preg_replace('/%%doc.(\w+)%%/e', "common_local_url('doc', array('title'=>'\\1'))", $c);
+	$c = preg_replace('/%%(\w+).(\w+)%%/e', 'common_config(\'\\1\', \'\\2\')', $c);
+	return Markdown($c);
+}