bring mod_common into the modern age

7 files changed, 50 insertions, 600 deletions

diff --git a/done b/done
index a8a4710ef..f8121ef5c 100644
--- a/done
+++ b/done
@@ -25,7 +25,7 @@ include/
   Contact.php
   contact_selectors.php
   contact_widgets.php
-  conversation.php
+? conversation.php
 + cronhooks.php
 ? crypto.php
 + datetime.php (todo: html removal)
@@ -83,7 +83,7 @@ mod/
   api.php
 + apps.php
 + attach.php
-? auth.php
+- auth.php
 - cb.php
   common.php
   community.php
diff --git a/mod/auth.php b/mod/auth.php
deleted file mode 100644
index 75d5fe545..000000000
--- a/mod/auth.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-
-
-
-require_once('include/items.php');
-require_once('include/auth.php');
-
-
-function auth_init(&$a) {
-
-
-	$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
-	$challenge       = ((x($_GET,'challenge'))       ? $_GET['challenge']            : '');
-	$sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
-
-	$api_version     = ((x($_GET,'api_version'))    ? (float) $_GET['api_version']   : 1.0);
-
-
-	if(($type === 'profile') && (! strlen($sec))) {
-
-		$sql_extra = '';
-		switch($direction) {
-			case (-1):
-				$sql_extra = sprintf(" AND ( `dfrn_id` = '%s' OR `issued_id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
-				$my_id = $dfrn_id;
-				break;
-			case 0:
-				$sql_extra = sprintf(" AND `issued_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-				$my_id = '1:' . $dfrn_id;
-				break;
-			case 1:
-				$sql_extra = sprintf(" AND `dfrn_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-				$my_id = '0:' . $dfrn_id;
-				break;
-			default:
-				goaway(z_root());
-				break; // NOTREACHED
-		}
-
-		$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` 
-			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
-			dbesc($a->argv[1])
-		);
-		
-		if(count($r)) {
-
-			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
-
-			logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
-
-			if(strlen($s)) {
-
-				$xml = parse_xml_string($s);
-
-				if((int) $xml->status == 1) {
-					$_SESSION['authenticated'] = 1;
-					if(! x($_SESSION,'remote'))
-						$_SESSION['remote'] = array();
-
-					$_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']);
-
-					$_SESSION['visitor_id'] = $r[0]['id'];
-					$_SESSION['visitor_home'] = $r[0]['url'];
-					$_SESSION['visitor_handle'] = $r[0]['addr'];
-					$_SESSION['visitor_visiting'] = $r[0]['uid'];
-					info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
-					// Visitors get 1 day session.
-					$session_id = session_id();
-					$expire = time() + 86400;
-					q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s' LIMIT 1",
-						dbesc($expire),
-						dbesc($session_id)
-					); 
-				}
-			}
-			$profile = $r[0]['nickname'];
-			goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/channel/' . $profile);
-		}
-		goaway(z_root());
-
-	}
-
-	if($type === 'profile-check' && $dfrn_version < 2.2 ) {
-
-		if((strlen($challenge)) && (strlen($sec))) {
-
-			q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
-			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
-				dbesc($sec)
-			);
-			if(! count($r)) {
-				xml_status(3, 'No ticket');
-				// NOTREACHED
-			}
-			$orig_id = $r[0]['dfrn_id'];
-			if(strpos($orig_id, ':'))
-				$orig_id = substr($orig_id,2);
-
-			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-				intval($r[0]['cid'])
-			);
-			if(! count($c)) {
-				xml_status(3, 'No profile');
-			}
-			$contact = $c[0];
-
-			$sent_dfrn_id = hex2bin($dfrn_id);
-			$challenge    = hex2bin($challenge);
-
-			$final_dfrn_id = '';
-
-			if(($contact['duplex']) && strlen($contact['prvkey'])) {
-				openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-				openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']);
-			}
-			else {
-				openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-				openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']);
-			}
-
-			$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-
-			if(strpos($final_dfrn_id,':') == 1)
-				$final_dfrn_id = substr($final_dfrn_id,2);
-
-			if($final_dfrn_id != $orig_id) {
-				logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
-				// did not decode properly - cannot trust this site 
-				xml_status(3, 'Bad decryption');
-			}
-
-			header("Content-type: text/xml");
-			echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
-			killme();
-			// NOTREACHED
-		}
-		else {
-				// old protocol
-
-			switch($direction) {
-				case 1:
-					$dfrn_id = '0:' . $dfrn_id;
-					break;
-				case 0:
-					$dfrn_id = '1:' . $dfrn_id;
-					break;
-				default:
-					break;
-			}
-
-
-			q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
-			$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
-				dbesc($dfrn_id));
-			if(count($r)) {
-				xml_status(1);
-				return; // NOTREACHED
-			}
-			xml_status(0);
-			return; // NOTREACHED
-		}
-	}
-
-}
-
-
-
-function auth_post(&$a) {
-
-	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? $_POST['dfrn_id']              : '');
-	$challenge    = ((x($_POST,'challenge'))    ? $_POST['challenge']            : '');
-	$url          = ((x($_POST,'url'))          ? $_POST['url']                  : '');
-	$sec          = ((x($_POST,'sec'))          ? $_POST['sec']                  : '');
-	$ptype        = ((x($_POST,'type'))         ? $_POST['type']                 : '');
-	$api_version = ((x($_POST,'api_version')) ? (float) $_POST['api_version'] : 1.0);
-	$perm         = ((x($_POST,'perm'))         ? $_POST['perm']                 : 'r');
-          
-	if($ptype === 'profile-check') {
-
-		if((strlen($challenge)) && (strlen($sec))) {
-
-			logger('dfrn_poll: POST: profile-check');
- 
-			q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
-			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
-				dbesc($sec)
-			);
-			if(! count($r)) {
-				xml_status(3, 'No ticket');
-				// NOTREACHED
-			}
-			$orig_id = $r[0]['dfrn_id'];
-			if(strpos($orig_id, ':'))
-				$orig_id = substr($orig_id,2);
-
-			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-				intval($r[0]['cid'])
-			);
-			if(! count($c)) {
-				xml_status(3, 'No profile');
-			}
-			$contact = $c[0];
-
-			$sent_dfrn_id = hex2bin($dfrn_id);
-			$challenge    = hex2bin($challenge);
-
-			$final_dfrn_id = '';
-
-			if(($contact['duplex']) && strlen($contact['prvkey'])) {
-				openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-				openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']);
-			}
-			else {
-				openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-				openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']);
-			}
-
-			$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-
-			if(strpos($final_dfrn_id,':') == 1)
-				$final_dfrn_id = substr($final_dfrn_id,2);
-
-			if($final_dfrn_id != $orig_id) {
-				logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
-				// did not decode properly - cannot trust this site 
-				xml_status(3, 'Bad decryption');
-			}
-
-			header("Content-type: text/xml");
-			echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
-			killme();
-			// NOTREACHED
-		}
-
-	}
-
-	$direction    = (-1);
-	if(strpos($dfrn_id,':') == 1) {
-		$direction = intval(substr($dfrn_id,0,1));
-		$dfrn_id   = substr($dfrn_id,2);
-	}
-
-
-	$r = q("SELECT * FROM `challenge` WHERE `dfrn_id` = '%s' AND `challenge` = '%s' LIMIT 1",
-		dbesc($dfrn_id),
-		dbesc($challenge)
-	);
-
-	if(! count($r))
-		killme();
-
-	$type = $r[0]['type'];
-	$last_update = $r[0]['last_update'];
-
-	$r = q("DELETE FROM `challenge` WHERE `dfrn_id` = '%s' AND `challenge` = '%s' LIMIT 1",
-		dbesc($dfrn_id),
-		dbesc($challenge)
-	);
-
-
-	$sql_extra = '';
-	switch($direction) {
-		case (-1):
-			$sql_extra = sprintf(" AND `issued_id` = '%s' ", dbesc($dfrn_id));
-			$my_id = $dfrn_id;
-			break;
-		case 0:
-			$sql_extra = sprintf(" AND `issued_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-			$my_id = '1:' . $dfrn_id;
-			break;
-		case 1:
-			$sql_extra = sprintf(" AND `dfrn_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-			$my_id = '0:' . $dfrn_id;
-			break;
-		default:
-			goaway(z_root());
-			break; // NOTREACHED
-	}
-
-
-	$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
-
-
-	if(! count($r))
-		killme();
-
-	$contact = $r[0];
-	$owner_uid = $r[0]['uid'];
-	$contact_id = $r[0]['id']; 
-
-
-	if($type === 'reputation' && strlen($url)) {
-		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($url),
-			intval($owner_uid)
-		);
-		$reputation = 0;
-		$text = '';
-
-		if(count($r)) {
-			$reputation = $r[0]['rating'];
-			$text = $r[0]['reason'];
-
-			if($r[0]['id'] == $contact_id) {	// inquiring about own reputation not allowed
-				$reputation = 0;
-				$text = '';
-			}
-		}
-
-		echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-		<reputation>
-			<url>$url</url>
-			<rating>$reputation</rating>
-			<description>$text</description>
-		</reputation>
-		";
-		killme();
-		// NOTREACHED
-	}
-	else {
-
-		// Update the writable flag if it changed		
-		logger('dfrn_poll: post request feed: ' . print_r($_POST,true),LOGGER_DATA);
-		if($dfrn_version >= 2.21) {
-			if($perm === 'rw')
-				$writable = 1;
-			else
-				$writable = 0;
-
-			if($writable !=  $contact['writable']) {
-				q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
-					intval($writable),
-					intval($contact_id)
-				);
-			}
-		}
-				
-		header("Content-type: application/atom+xml");
-		$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
-		echo $o;
-		killme();
-
-	}
-}
-
-function auth_content(&$a) {
-
-	$dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
-	$type            = ((x($_GET,'type'))            ? $_GET['type']                 : 'data');
-	$last_update     = ((x($_GET,'last_update'))     ? $_GET['last_update']          : '');
-	$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
-	$sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
-	$api_version    = ((x($_GET,'api_version'))    ? (float) $_GET['api_version'] : 1.0);
-	$perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
-
-	$direction = (-1);
-	if(strpos($dfrn_id,':') == 1) {
-		$direction = intval(substr($dfrn_id,0,1));
-		$dfrn_id = substr($dfrn_id,2);
-	}
-
-
-	if($dfrn_id != '') {
-		// initial communication from external contact
-		$hash = random_string();
-
-		$status = 0;
-
-		$r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
-
-		if($type !== 'profile') {
-			$r = q("INSERT INTO `challenge` ( `challenge`, `dfrn_id`, `expire` , `type`, `last_update` )
-				VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
-				dbesc($hash),
-				dbesc($dfrn_id),
-				intval(time() + 60 ),
-				dbesc($type),
-				dbesc($last_update)
-			);
-		}
-		$sql_extra = '';
-		switch($direction) {
-			case (-1):
-				if($type === 'profile')
-					$sql_extra = sprintf(" AND ( `dfrn_id` = '%s' OR `issued_id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
-				else
-					$sql_extra = sprintf(" AND `issued_id` = '%s' ", dbesc($dfrn_id));
-				$my_id = $dfrn_id;
-				break;
-			case 0:
-				$sql_extra = sprintf(" AND `issued_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-				$my_id = '1:' . $dfrn_id;
-				break;
-			case 1:
-				$sql_extra = sprintf(" AND `dfrn_id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-				$my_id = '0:' . $dfrn_id;
-				break;
-			default:
-				goaway(z_root());
-				break; // NOTREACHED
-		}
-
-		$nickname = $a->argv[1];
-
-		$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` 
-			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
-			dbesc($nickname)
-		);
-
-		if(count($r)) {
-
-			$challenge = '';
-			$encrypted_id = '';
-			$id_str = $my_id . '.' . mt_rand(1000,9999);
-
-			if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) {
-				openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
-				openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
-			}
-			else {
-				openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']);
-				openssl_private_encrypt($id_str,$encrypted_id,$r[0]['prvkey']);
-			}
-
-			$challenge = bin2hex($challenge);
-			$encrypted_id = bin2hex($encrypted_id);
-		}
-		else {
-			$status = 1;
-			$challenge = '';
-			$encrypted_id = '';
-		}
-
-		if(strlen($sec)) {
-
-			// URL reply
-
-			$s = post_url($r[0]['poll'], array(
-				'dfrn_id' => $encrypted_id,
-				'type' => 'profile-check',
-				'dfrn_version' => DFRN_PROTOCOL_VERSION,
-				'challenge' => $challenge,
-				'sec' => $sec
-			));
-			
-		$profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
-
-		switch($destination_url) {
-			case 'profile':
-				$dest = $a->get_baseurl() . '/profile/' . $profile ;
-				break;
-			case 'photos':
-				$dest = $a->get_baseurl() . '/photos/' . $profile;
-				break;
-			case 'status':
-			case '':
-				$dest = $a->get_baseurl() . '/channel/' . $profile;
-				break;		
-			default:
-				$dest = $destination_url;
-				break;
-		}
-
-		logger("mod-auth: sec profile: " . $s, LOGGER_DATA);
-
-		if(strlen($s)) {
-
-			$j = json_decode($s);
-
-			logger('mod-auth: profile: parsed json: ' . print_r($j,true), LOGGER_DATA);
-			logger('mod-auth: secure profile: challenge: ' . $j->challenge . ' expecting ' . $hash);
-			logger('mod-auth: secure profile: sec: ' . $j->sec . ' expecting ' . $sec);
- 
-				
-			if(((int) $j->status == 0) && ($j->challenge == $hash)  && ($j->sec == $sec)) {
-				$_SESSION['authenticated'] = 1;
-				if(! x($_SESSION,'remote'))
-					$_SESSION['remote'] = array();
-				$_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']);
-				$_SESSION['visitor_id'] = $r[0]['id'];
-				$_SESSION['visitor_home'] = $r[0]['url'];
-				$_SESSION['visitor_visiting'] = $r[0]['uid'];
-				info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
-				// Visitors get 1 day session.
-				$session_id = session_id();
-				$expire = time() + 86400;
-				q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s' LIMIT 1",
-					dbesc($expire),
-					dbesc($session_id)
-				); 
-			}
-			
-			goaway($dest);
-			// NOTREACHED
-
-		}
-		else {
-			// XML reply
-			header("Content-type: text/xml");
-			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n"
-				. '<dfrn_poll>' . "\r\n"
-				. "\t" . '<status>' . $status . '</status>' . "\r\n"
-				. "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n"
-				. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
-				. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
-				. '</dfrn_poll>' . "\r\n" ;
-			killme();
-			// NOTREACHED
-		}
-	}
-}
-}
-
diff --git a/mod/common.php b/mod/common.php
index 617b5b670..bd2a0eef7 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -2,99 +2,71 @@
 
 require_once('include/socgraph.php');
 
-function common_content(&$a) {
-
-	$o = '';
-
-	$cmd = $a->argv[1];
-	$uid = intval($a->argv[2]);
-	$cid = intval($a->argv[3]);
-	$zcid = 0;
-
-	if($cmd !== 'loc' && $cmd != 'rem')
-		return;
-	if(! $uid)
-		return;
+function common_init(&$a) {
 
-	if($cmd === 'loc' && $cid) {	
-		$c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
-			intval($cid),
-			intval($uid)
-		);
-	}
+	if(argc() > 1)
+		$which = argv(1);
 	else {
-		$c = q("select name, url, photo from contact where self = 1 and uid = %d limit 1",
-			intval($uid)
-		);
-	}	
-
-	$a->page['aside'] .= '<div class="vcard">' 
-		. '<div class="fn label">' . $c[0]['name'] . '</div>' 
-		. '<div id="profile-photo-wrapper">'
-		. '<img class="photo" width="175" height="175" 
-		src="' . $c[0]['photo'] . '" alt="' . $c[0]['name'] . '" /></div>'
-		. '</div>';
-	
-
-	if(! count($c))
+		notice( t('Requested profile is not available.') . EOL );
+		$a->error = 404;
 		return;
+	}
+
+	$profile = 0;
+	$channel = $a->get_channel();
 
-	$o .= '<h2>' . t('Common Friends') . '</h2>';
-
-
-	if(! $cid) {
-		if(get_my_url()) {
-			$r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
-				dbesc(normalise_link(get_my_url())),
-				intval($profile_uid)
-			);
-			if(count($r))
-				$cid = $r[0]['id'];
-			else {
-				$r = q("select id from gcontact where nurl = '%s' limit 1",
-					dbesc(normalise_link(get_my_url()))
-				);
-				if(count($r))
-					$zcid = $r[0]['id'];
-			}
-		}
+	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
+		$which = $channel['channel_address'];
+		$profile = argv(1);		
 	}
 
+	// Run profile_load() here to make sure the theme is set before
+	// we start loading content
 
+	profile_load($a,$which,$profile);
 
-	if($cid == 0 && $zcid == 0)
-		return; 
+}
 
+function common_aside(&$a) {
+	if(! $a->profile['profile_uid'])
+		return;
 
-	if($cid)
-		$t = count_common_friends($uid,$cid);
-	else
-		$t = count_common_friends_zcid($uid,$zcid);
+	profile_create_sidebar($a);
+}
 
 
-	$a->set_pager_total($t);
+function common_content(&$a) {
 
-	if(! $t) {
-		notice( t('No contacts in common.') . EOL);
-		return $o;
-	}
+	$o = '';
+
+	if(! $a->profile['profile_uid'])
+		return;
 
+	$observer_hash = get_observer_hash();
 
-	if($cid)
-		$r = common_friends($uid,$cid);
-	else
-		$r = common_friends_zcid($uid,$zcid);
 
+	if(! perm_is_allowed($a->profile['profile_uid'],$observer_hash,'view_contacts')) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$o .= '<h2>' . t('Common connections') . '</h2>';
 
-	if(! count($r)) {
+	$t = count_common_friends($a->profile['profile_uid'],$observer_hash);
+
+	if(! $t)
+		notice( t('No connections in common.') . EOL);
 		return $o;
 	}
 
+	$r = common_friends($a->profile['profile_uid'],$observer_hash);
+
+	if($r) {
+
 	$tpl = get_markup_template('common_friends.tpl');
 
 	foreach($r as $rr) {
-			
-		$o .= replace_macros($tpl,array(
+			$o .= replace_macros($tpl,array(
 			'$url' => $rr['url'],
 			'$name' => $rr['name'],
 			'$photo' => $rr['photo'],
@@ -103,6 +75,5 @@ function common_content(&$a) {
 	}
 
 	$o .= cleardiv();
-//	$o .= paginate($a);
 	return $o;
 }
diff --git a/util/typo.php b/util/typo.php
index bb2fc67c9..c4d038ce8 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -12,15 +12,15 @@
 	
 	$a = new App();
 
-	echo "Directory: mod\n";
-	$files = glob('mod/*.php');
+	echo "Directory: include\n";
+	$files = glob('include/*.php');
 	foreach($files as $file) {
 		echo $file . "\n";
 		include_once($file);
 	}
 
-	echo "Directory: include\n";
-	$files = glob('include/*.php');
+	echo "Directory: mod\n";
+	$files = glob('mod/*.php');
 	foreach($files as $file) {
 		echo $file . "\n";
 		include_once($file);
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
index 09ce3588e..48bdd548f 100644
--- a/view/tpl/remote_friends_common.tpl
+++ b/view/tpl/remote_friends_common.tpl
@@ -1,5 +1,5 @@
 <div id="remote-friends-in-common" class="bigwidget">
-	<div id="rfic-desc">$desc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ if $linkmore }}<a href="$base/common/rem/$uid/$cid">$more</a>{{ endif }}</div>
+	<div id="rfic-desc">$desc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ if $linkmore }}<a href="$base/common/$uid">$more</a>{{ endif }}</div>
 	{{ if $items }}
 	{{ for $items as $item }}
 	<div class="profile-match-wrapper">
diff --git a/view/tpl/smarty3/remote_friends_common.tpl b/view/tpl/smarty3/remote_friends_common.tpl
index b1156a1a8..8416b053a 100644
--- a/view/tpl/smarty3/remote_friends_common.tpl
+++ b/view/tpl/smarty3/remote_friends_common.tpl
@@ -4,7 +4,7 @@
  *
  *}}
 <div id="remote-friends-in-common" class="bigwidget">
-	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/rem/{{$uid}}/{{$cid}}">{{$more}}</a>{{/if}}</div>
+	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div>
 	{{if $items}}
 	{{foreach $items as $item}}
 	<div class="profile-match-wrapper">
diff --git a/view/tpl/smarty3/settings.tpl b/view/tpl/smarty3/settings.tpl
index 316c52d62..251fa9be4 100644
--- a/view/tpl/smarty3/settings.tpl
+++ b/view/tpl/smarty3/settings.tpl
@@ -26,10 +26,6 @@
 <h3 class="settings-heading">{{$h_prv}}</h3>
 
 
-<input type="hidden" name="visibility" value="{{$visibility}}" />
-
-
-
 <div id="settings-permissions-wrapper">
 {{foreach $permiss_arr as $permit}}
 {{include file="field_select.tpl" field=$permit}}