more DB cleanup

6 files changed, 12 insertions, 775 deletions

diff --git a/boot.php b/boot.php
index 2bff1b799..82ed8b832 100644
--- a/boot.php
+++ b/boot.php
@@ -17,7 +17,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica Red');
 define ( 'FRIENDICA_VERSION',      trim(file_get_contents('version.inc')) . 'R');
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'ZOT_REVISION',               1     ); 
-define ( 'DB_UPDATE_VERSION',       1005     );
+define ( 'DB_UPDATE_VERSION',       1006     );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/done b/done
index 55e2c7ed3..b413ae003 100644
--- a/done
+++ b/done
@@ -88,13 +88,8 @@ mod/
   common.php
   community.php
   contactgroup.php
-- contacts.php
   crepair.php
   delegate.php
-- dfrn_confirm.php
-- dfrn_notify.php
-- dfrn_poll.php
-- dfrn_request.php
   directory.php
   dirfind.php
   display.php
@@ -122,7 +117,7 @@ mod/
   magic.php
 + manage.php
   match.php
-  message.php
+? message.php
 ? mood.php
   msearch.php
 ? network.php
@@ -148,7 +143,7 @@ mod/
   qsearch.php
 + randprof.php
 - redir.php
-- register.php
++ register.php
   regmod.php
   removeme.php
   rsd_xml.php (what do we need this for? What functionality/feature does it enable)
@@ -170,7 +165,6 @@ mod/
   view.php
 + viewsrc.php
 ? wall_attach.php (needs remote permissions refactor)
-- wallmessage.php
 ? wall_upload.php (needs remote permissions refactor)
   webfinger.php
 + _well_known.php
@@ -178,4 +172,4 @@ mod/
 + zchannel.php
 + zfinger.php
 ? zperms.php
-+ register.php
+
diff --git a/install/database.sql b/install/database.sql
index 4030eb7ea..83684c3d7 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -361,13 +361,6 @@ CREATE TABLE IF NOT EXISTS `group_member` (
   KEY `xchan` (`xchan`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `guid` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `guid` char(64) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `guid` (`guid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `hook` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `hook` char(255) NOT NULL,
@@ -564,17 +557,6 @@ CREATE TABLE IF NOT EXISTS `notify` (
   KEY `otype` (`otype`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `notify-threads` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `notify-id` int(11) NOT NULL,
-  `master-parent-item` int(10) unsigned NOT NULL DEFAULT '0',
-  `parent-item` int(10) unsigned NOT NULL DEFAULT '0',
-  `receiver-uid` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `master-parent-item` (`master-parent-item`),
-  KEY `receiver-uid` (`receiver-uid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `outq` (
   `outq_hash` char(255) NOT NULL,
   `outq_account` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/install/update.php b/install/update.php
index 48cb15c03..06e3ef9f9 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1005 );
+define( 'UPDATE_VERSION' , 1006 );
 
 /**
  *
@@ -98,4 +98,11 @@ PRIMARY KEY ( `site_url` )
 	if($r && $r2)
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
+}
+
+
+function update_r1005() {
+	q("drop table guid");
+	q("drop table `notify-threads`);
+	return UPDATE_SUCCESS;
 }
\ No newline at end of file
diff --git a/mod/contacts.php b/mod/contacts.php
deleted file mode 100644
index 09a4e6c97..000000000
--- a/mod/contacts.php
+++ /dev/null
@@ -1,597 +0,0 @@
-<?php
-
-require_once('include/Contact.php');
-require_once('include/socgraph.php');
-require_once('include/contact_selectors.php');
-
-function contacts_init(&$a) {
-	if(! local_user())
-		return;
-
-	$contact_id = 0;
-
-	if(($a->argc == 2) && intval($a->argv[1])) {
-		$contact_id = intval($a->argv[1]);
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
-			intval(local_user()),
-			intval($contact_id)
-		);
-		if(! count($r)) {
-			$contact_id = 0;
-		}
-	}
-
-	require_once('include/group.php');
-	require_once('include/contact_widgets.php');
-
-	if(! x($a->page,'aside'))
-		$a->page['aside'] = '';
-
-	if($contact_id) {
-			$a->data['contact'] = $r[0];
-			$o .= '<div class="vcard">';
-			$o .= '<div class="fn">' . $a->data['contact']['name'] . '</div>';
-			$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->data['contact']['photo'] . '" alt="' . $a->data['contact']['name'] . '" /></div>';
-			$o .= '</div>';
-			$a->page['aside'] .= $o;
-
-	}	
-	else
-		$a->page['aside'] .= follow_widget();
-
-	$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
-
-	$a->page['aside'] .= findpeople_widget();
-
-	$base = $a->get_baseurl();
-
-	$a->page['htmlhead'] .= <<< EOT
-
-<script>$(document).ready(function() { 
-	var a; 
-	a = $("#contacts-search").autocomplete({ 
-		serviceUrl: '$base/acl',
-		minChars: 2,
-		width: 350,
-	});
-	a.setOptions({ params: { type: 'a' }});
-
-}); 
-
-</script>
-EOT;
-
-
-}
-
-function contacts_post(&$a) {
-	
-	if(! local_user())
-		return;
-
-	$contact_id = intval($a->argv[1]);
-	if(! $contact_id)
-		return;
-
-	$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($contact_id),
-		intval(local_user())
-	);
-
-	if(! count($orig_record)) {
-		notice( t('Could not access contact record.') . EOL);
-		goaway($a->get_baseurl(true) . '/contacts');
-		return; // NOTREACHED
-	}
-
-	call_hooks('contact_edit_post', $_POST);
-
-	$profile_id = intval($_POST['profile-assign']);
-	if($profile_id) {
-		$r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($profile_id),
-			intval(local_user())
-		);
-		if(! count($r)) {
-			notice( t('Could not locate selected profile.') . EOL);
-			return;
-		}
-	}
-
-	$hidden = intval($_POST['hidden']);
-
-	$priority = intval($_POST['poll']);
-	if($priority > 5 || $priority < 0)
-		$priority = 0;
-
-	$closeness = intval($_POST['closeness']);
-	if($closeness < 0)
-		$closeness = 99;
-
-	$info = fix_mce_lf(escape_tags(trim($_POST['info'])));
-
-	$r = q("UPDATE `contact` SET `profile_id` = %d, `priority` = %d , `info` = '%s',
-		`hidden` = %d, closeness = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($profile_id),
-		intval($priority),
-		dbesc($info),
-		intval($hidden),
-		intval($closeness),
-		intval($contact_id),
-		intval(local_user())
-	);
-	if($r)
-		info( t('Contact updated.') . EOL);
-	else
-		notice( t('Failed to update contact record.') . EOL);
-
-	$r = q("select * from contact where id = %d and uid = %d limit 1",
-		intval($contact_id),
-		intval(local_user())
-	);
-	if($r && count($r))
-		$a->data['contact'] = $r[0];
-
-	return;
-
-}
-
-
-
-function contacts_content(&$a) {
-
-	$sort_type = 0;
-	$o = '';
-	nav_set_selected('contacts');
-
-
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-
-	if($a->argc == 3) {
-
-		$contact_id = intval($a->argv[1]);
-		if(! $contact_id)
-			return;
-
-		$cmd = $a->argv[2];
-
-		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
-			intval($contact_id),
-			intval(local_user())
-		);
-
-		if(! count($orig_record)) {
-			notice( t('Could not access contact record.') . EOL);
-			goaway($a->get_baseurl(true) . '/contacts');
-			return; // NOTREACHED
-		}
-		
-		if($cmd === 'update') {
-
-			// pull feed and consume it, which should subscribe to the hub.
-			proc_run('php',"include/poller.php","$contact_id");
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
-			// NOTREACHED
-		}
-
-		if($cmd === 'block') {
-			$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
-			$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($blocked),
-				intval($contact_id),
-				intval(local_user())
-			);
-			if($r) {
-				//notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
-				info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
-			}
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
-			return; // NOTREACHED
-		}
-
-		if($cmd === 'ignore') {
-			$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
-			$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($readonly),
-				intval($contact_id),
-				intval(local_user())
-			);
-			if($r) {
-				info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
-			}
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
-			return; // NOTREACHED
-		}
-
-
-		if($cmd === 'archive') {
-			$archived = (($orig_record[0]['archive']) ? 0 : 1);
-			$r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($archived),
-				intval($contact_id),
-				intval(local_user())
-			);
-			if($r) {
-				//notice( t('Contact has been ') . (($archived) ? t('archived') : t('unarchived')) . EOL );
-				info( (($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL );
-			}
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
-			return; // NOTREACHED
-		}
-
-		if($cmd === 'drop') {
-
-			require_once('include/Contact.php');
-
-			terminate_friendship($a->user,$a->contact,$orig_record[0]);
-
-			contact_remove($orig_record[0]['id']);
-			info( t('Contact has been removed.') . EOL );
-			if(x($_SESSION,'return_url'))
-				goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
-			else
-				goaway($a->get_baseurl(true) . '/contacts');
-			return; // NOTREACHED
-		}
-	}
-
-	if((x($a->data,'contact')) && (is_array($a->data['contact']))) {
-
-		$contact_id = $a->data['contact']['id'];
-		$contact = $a->data['contact'];
-
-		$editselect = 'exact';
-		if(intval(get_pconfig(local_user(),'system','plaintext')))
-			$editselect = 'none';
-
-		$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
-			'$baseurl' => $a->get_baseurl(true),
-			'$editselect' => $editselect,
-		));
-
-		require_once('include/contact_selectors.php');
-
-		$tpl = get_markup_template("contact_edit.tpl");
-
-		switch($contact['rel']) {
-			case CONTACT_IS_FRIEND:
-				$dir_icon = 'images/lrarrow.gif';
-				$relation_text = t('You are mutual friends with %s');
-				break;
-			case CONTACT_IS_FOLLOWER;
-				$dir_icon = 'images/larrow.gif';
-				$relation_text = t('You are sharing with %s');
-				break;
-	
-			case CONTACT_IS_SHARING;
-				$dir_icon = 'images/rarrow.gif';
-				$relation_text = t('%s is sharing with you');
-				break;
-			default:
-				break;
-		}
-
-		$relation_text = sprintf($relation_text,$contact['name']);
-
-		if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
-			$url = "redir/{$contact['id']}";
-			$sparkle = ' class="sparkle" ';
-		}
-		else { 
-			$url = $contact['url'];
-			$sparkle = '';
-		}
-
-		$insecure = t('Private communications are not available for this contact.');
-
-		$last_update = (($contact['last_update'] == '0000-00-00 00:00:00') 
-				? t('Never') 
-				: datetime_convert('UTC',date_default_timezone_get(),$contact['last_update'],'D, j M Y, g:i A'));
-
-		if($contact['last_update'] !== '0000-00-00 00:00:00')
-			$last_update .= ' ' . (($contact['last_update'] == $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
-
-		$lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
-
-		$poll_enabled = (($contact['network'] !== NETWORK_DIASPORA) ? true : false);
-
-		$nettype = sprintf( t('Network type: %s'),network_to_name($contact['network']));
-
-		$common = count_common_friends(local_user(),$contact['id']);
-		$common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : '');
-
-		$polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : ''); 
-
-		$x = count_all_friends(local_user(), $contact['id']);
-		$all_friends = (($x) ? t('View all contacts') : '');
-
-		// tabs
-		$tabs = array(
-			array(
-				'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
-				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
-				'sel'   => '',
-				'title' => t('Toggle Blocked status'),
-			),
-			array(
-				'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
-				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
-				'sel'   => '',
-				'title' => t('Toggle Ignored status'),
-			),
-
-			array(
-				'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
-				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
-				'sel'   => '',
-				'title' => t('Toggle Archive status'),
-			),
-			array(
-				'label' => t('Repair'),
-				'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
-				'sel'   => '',
-				'title' => t('Advanced Contact Settings'),
-			)
-		);
-		$tab_tpl = get_markup_template('common_tabs.tpl');
-		$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
-
-		$lost_contact = (($contact['archive'] && $contact['term_date'] != '0000-00-00 00:00:00' && $contact['term_date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
-
-		$slider_tpl = get_markup_template('contact_slider.tpl');
-		$o .= replace_macros($slider_tpl,array(
-			'$me' => t('Me'),
-			'$val' => $contact['closeness'],
-			'$intimate' => t('Best Friends'),
-			'$friends' => t('Friends'),
-			'$coworkers' => t('Co-workers'),
-			'$oldfriends' => t('Former Friends'),
-			'$acquaintances' => t('Acquaintances'),
-			'$world' => t('Everybody')
-		));
-
-		$o .= replace_macros($tpl,array(
-			'$header' => t('Contact Editor'),
-			'$tab_str' => $tab_str,
-			'$submit' => t('Submit'),
-			'$lbl_vis1' => t('Profile Visibility'),
-			'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['name']),
-			'$lbl_info1' => t('Contact Information / Notes'),
-			'$infedit' => t('Edit contact notes'),
-			'$close' => $contact['closeness'],
-			'$common_text' => $common_text,
-			'$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
-			'$all_friends' => $all_friends,
-			'$relation_text' => $relation_text,
-			'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
-			'$blockunblock' => t('Block/Unblock contact'),
-			'$ignorecont' => t('Ignore contact'),
-			'$lblcrepair' => t("Repair URL settings"),
-			'$lblrecent' => t('View conversations'),
-			'$lblsuggest' => $lblsuggest,
-			'$delete' => t('Delete contact'),
-			'$nettype' => $nettype,
-			'$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
-			'$poll_enabled' => $poll_enabled,
-			'$lastupdtext' => t('Last update:'),
-			'$lost_contact' => $lost_contact,
-			'$updpub' => t('Update public posts'),
-			'$last_update' => $last_update,
-			'$udnow' => t('Update now'),
-			'$profile_select' => contact_profile_assign($contact['profile_id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)),
-			'$contact_id' => $contact['id'],
-			'$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
-			'$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
-			'$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
-			'$info' => $contact['info'],
-			'$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
-			'$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
-			'$archived' => (($contact['archive']) ? t('Currently archived') : ''),
-			'$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts <strong>may</strong> still be visible')),
-			'$photo' => $contact['photo'],
-			'$name' => $contact['name'],
-			'$dir_icon' => $dir_icon,
-			'$alt_text' => $alt_text,
-			'$sparkle' => $sparkle,
-			'$url' => $url
-
-		));
-
-		$arr = array('contact' => $contact,'output' => $o);
-
-		call_hooks('contact_edit', $arr);
-
-		return $arr['output'];
-
-	}
-
-	$blocked = false;
-	$hidden = false;
-	$ignored = false;
-	$all = false;
-
-	$_SESSION['return_url'] = $a->query_string;
-
-	if(($a->argc == 2) && ($a->argv[1] === 'all')) {
-		$sql_extra = '';
-		$all = true;
-	}
-	elseif(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
-		$sql_extra = " AND `blocked` = 1 ";
-		$blocked = true;
-	}
-	elseif(($a->argc == 2) && ($a->argv[1] === 'hidden')) {
-		$sql_extra = " AND `hidden` = 1 ";
-		$hidden = true;
-	}
-	elseif(($a->argc == 2) && ($a->argv[1] === 'ignored')) {
-		$sql_extra = " AND `readonly` = 1 ";
-		$ignored = true;
-	}
-	elseif(($a->argc == 2) && ($a->argv[1] === 'archived')) {
-		$sql_extra = " AND `archive` = 1 ";
-		$archived = true;
-	}
-	else
-		$sql_extra = " AND `blocked` = 0 ";
-
-	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
-	$nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : '');
-
-	$tabs = array(
-		array(
-			'label' => t('Suggestions'),
-			'url'   => $a->get_baseurl(true) . '/suggest', 
-			'sel'   => '',
-			'title' => t('Suggest potential friends'),
-		),
-		array(
-			'label' => t('All Contacts'),
-			'url'   => $a->get_baseurl(true) . '/contacts/all', 
-			'sel'   => ($all) ? 'active' : '',
-			'title' => t('Show all contacts'),
-		),
-		array(
-			'label' => t('Unblocked'),
-			'url'   => $a->get_baseurl(true) . '/contacts',
-			'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
-			'title' => t('Only show unblocked contacts'),
-		),
-
-		array(
-			'label' => t('Blocked'),
-			'url'   => $a->get_baseurl(true) . '/contacts/blocked',
-			'sel'   => ($blocked) ? 'active' : '',
-			'title' => t('Only show blocked contacts'),
-		),
-
-		array(
-			'label' => t('Ignored'),
-			'url'   => $a->get_baseurl(true) . '/contacts/ignored',
-			'sel'   => ($ignored) ? 'active' : '',
-			'title' => t('Only show ignored contacts'),
-		),
-
-		array(
-			'label' => t('Archived'),
-			'url'   => $a->get_baseurl(true) . '/contacts/archived',
-			'sel'   => ($archived) ? 'active' : '',
-			'title' => t('Only show archived contacts'),
-		),
-
-		array(
-			'label' => t('Hidden'),
-			'url'   => $a->get_baseurl(true) . '/contacts/hidden',
-			'sel'   => ($hidden) ? 'active' : '',
-			'title' => t('Only show hidden contacts'),
-		),
-
-	);
-
-	$tab_tpl = get_markup_template('common_tabs.tpl');
-	$t = replace_macros($tab_tpl, array('$tabs'=>$tabs));
-
-
-
-	$searching = false;
-	if($search) {
-		$search_hdr = $search;
-		$search_txt = dbesc(protect_sprintf(preg_quote($search)));
-		$searching = true;
-	}
-	$sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : "");
-
-	if($nets)
-		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
- 
-	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
-
-	
-	$r = q("SELECT COUNT(*) AS `total` FROM `contact` 
-		WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
-		intval($_SESSION['uid']));
-	if(count($r)) {
-		$a->set_pager_total($r[0]['total']);
-		$total = $r[0]['total'];
-	}
-
-
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
-		intval($_SESSION['uid']),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
-	);
-
-	$contacts = array();
-
-	if(count($r)) {
-
-		foreach($r as $rr) {
-
-			switch($rr['rel']) {
-				case CONTACT_IS_FRIEND:
-					$dir_icon = 'images/lrarrow.gif';
-					$alt_text = t('Mutual Friendship');
-					break;
-				case  CONTACT_IS_FOLLOWER;
-					$dir_icon = 'images/larrow.gif';
-					$alt_text = t('is a fan of yours');
-					break;
-				case CONTACT_IS_SHARING;
-					$dir_icon = 'images/rarrow.gif';
-					$alt_text = t('you are a fan of');
-					break;
-				default:
-					break;
-			}
-			if(($rr['network'] === 'dfrn') && ($rr['rel'])) {
-				$url = "redir/{$rr['id']}";
-				$sparkle = ' class="sparkle" ';
-			}
-			else { 
-				$url = $rr['url'];
-				$sparkle = '';
-			}
-
-
-			$contacts[] = array(
-				'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
-				'edit_hover' => t('Edit contact'),
-				'photo_menu' => contact_photo_menu($rr),
-				'id' => $rr['id'],
-				'alt_text' => $alt_text,
-				'dir_icon' => $dir_icon,
-				'thumb' => $rr['thumb'], 
-				'name' => $rr['name'],
-				'username' => $rr['name'],
-				'sparkle' => $sparkle,
-				'itemurl' => $rr['url'],
-				'url' => $url,
-				'network' => network_to_name($rr['network']),
-			);
-		}
-
-		
-
-	}
-	
-	$tpl = get_markup_template("contacts-template.tpl");
-	$o .= replace_macros($tpl,array(
-		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
-		'$tabs' => $t,
-		'$total' => $total,
-		'$search' => $search_hdr,
-		'$desc' => t('Search your contacts'),
-		'$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
-		'$submit' => t('Find'),
-		'$cmd' => $a->cmd,
-		'$contacts' => $contacts,
-		'$paginate' => paginate($a),
-
-	)); 
-	
-	return $o;
-}
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
deleted file mode 100644
index 8a1194104..000000000
--- a/mod/wallmessage.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-require_once('include/message.php');
-
-function wallmessage_post(&$a) {
-
-	$replyto = get_my_url();
-	if(! $replyto) {
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-
-	$subject   = ((x($_REQUEST,'subject'))   ? notags(trim($_REQUEST['subject']))   : '');
-	$body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
-
-	$recipient = (($a->argc > 1) ? notags($a->argv[1]) : '');
-	if((! $recipient) || (! $body)) {
-		return;
-	}
-
-	$r = q("select * from user where nickname = '%s' limit 1",
-		dbesc($recipient)
-	);
-
-	if(! count($r)) {
-		logger('wallmessage: no recipient');
-		return;
-	}
-
-	$user = $r[0];
-
-	if(! intval($user['unkmail'])) {
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-
-	$r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1",
-			intval($user['uid'])
-	);
-
-	if($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
-		return;
-	}
-
-	// Work around doubled linefeeds in Tinymce 3.5b2
-
-	$body = str_replace("\r\n","\n",$body);
-	$body = str_replace("\n\n","\n",$body);
-
-	
-	$ret = send_wallmessage($user, $body, $subject, $replyto);
-
-	switch($ret){
-		case -1:
-			notice( t('No recipient selected.') . EOL );
-			break;
-		case -2:
-			notice( t('Unable to check your home location.') . EOL );
-			break;
-		case -3:
-			notice( t('Message could not be sent.') . EOL );
-			break;
-		case -4:
-			notice( t('Message collection failure.') . EOL );
-			break;
-		default:
-			info( t('Message sent.') . EOL );
-	}
-
-//	goaway($a->get_baseurl() . '/channel/' . $user['nickname']);
-	
-}
-
-
-function wallmessage_content(&$a) {
-
-	if(! get_my_url()) {
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-
-	$recipient = (($a->argc > 1) ? $a->argv[1] : '');
-
-	if(! $recipient) {
-		notice( t('No recipient.') . EOL);
-		return;
-	}
-
-	$r = q("select * from user where nickname = '%s' limit 1",
-		dbesc($recipient)
-	);
-
-	if(! count($r)) {
-		notice( t('No recipient.') . EOL);
-		logger('wallmessage: no recipient');
-		return;
-	}
-
-	$user = $r[0];
-
-	if(! intval($user['unkmail'])) {
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-
-	$r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1",
-			intval($user['uid'])
-	);
-
-	if($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
-		return;
-	}
-
-
-
-	$tpl = get_markup_template('wallmsg-header.tpl');
-
-		$a->page['htmlhead'] .= replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(true),
-			'$editselect' => '/(profile-jot-text|prvmail-text)/',
-			'$nickname' => $user['nickname'],
-			'$linkurl' => t('Please enter a link URL:')
-		));
-	
-
-	
-		$tpl = get_markup_template('wallmessage.tpl');
-		$o .= replace_macros($tpl,array(
-			'$header' => t('Send Private Message'),
-			'$subheader' => sprintf( t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']),
-			'$to' => t('To:'),
-			'$subject' => t('Subject:'),
-			'$recipname' => $user['username'],
-			'$nickname' => $user['nickname'],
-			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-			'$readonly' => '',
-			'$yourmessage' => t('Your message:'),
-			'$select' => $select,
-			'$parent' => '',
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$wait' => t('Please wait')
-		));
-
-		return $o;
-	}