module updates

1 files changed, 0 insertions, 318 deletions

diff --git a/mod/connections.php b/mod/connections.php
deleted file mode 100644
index 992d485bd..000000000
--- a/mod/connections.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-
-require_once('include/Contact.php');
-require_once('include/socgraph.php');
-require_once('include/contact_selectors.php');
-require_once('include/group.php');
-require_once('include/contact_widgets.php');
-require_once('include/zot.php');
-require_once('include/widgets.php');
-
-function connections_init(&$a) {
-
-	if(! local_channel())
-		return;
-
-	$channel = App::get_channel();
-	if($channel)
-		head_set_icon($channel['xchan_photo_s']);
-
-}
-
-function connections_content(&$a) {
-
-	$sort_type = 0;
-	$o = '';
-
-
-	if(! local_channel()) {
-		notice( t('Permission denied.') . EOL);
-		return login();
-	}
-
-	$blocked     = false;
-	$hidden      = false;
-	$ignored     = false;
-	$archived    = false;
-	$unblocked   = false;
-	$pending     = false;
-	$unconnected = false;
-	$all         = false;
-
-	if(! $_REQUEST['aj'])
-		$_SESSION['return_url'] = App::$query_string;
-
-	$search_flags = '';
-	$head = '';
-
-	if(argc() == 2) {
-		switch(argv(1)) {
-			case 'blocked':
-				$search_flags = " and abook_blocked = 1 ";
-				$head = t('Blocked');
-				$blocked = true;
-				break;
-			case 'ignored':
-				$search_flags = " and abook_ignored = 1 ";
-				$head = t('Ignored');
-				$ignored = true;
-				break;
-			case 'hidden':
-				$search_flags = " and abook_hidden = 1 ";
-				$head = t('Hidden');
-				$hidden = true;
-				break;
-			case 'archived':
-				$search_flags = " and abook_archived = 1 ";
-				$head = t('Archived');
-				$archived = true;
-				break;
-			case 'pending':
-				$search_flags = " and abook_pending = 1 ";
-				$head = t('New');
-				$pending = true;
-				nav_set_selected('intros');
-				break;
-			case 'ifpending':
-				$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
-					intval(local_channel())
-				);
-				if($r && $r[0]['total']) {
-					$search_flags = " and abook_pending = 1 ";
-					$head = t('New');
-					$pending = true;
-					nav_set_selected('intros');
-					App::$argv[1] = 'pending';
-				}
-				else {
-					$head = t('All');
-					$search_flags = '';
-					$all = true;
-					App::$argc = 1;
-					unset(App::$argv[1]);
-				}
-				nav_set_selected('intros');
-				break;
-//			case 'unconnected':
-//				$search_flags = " and abook_unconnected = 1 ";
-//				$head = t('Unconnected');
-//				$unconnected = true;
-//				break;
-
-			case 'all':
-				$head = t('All');
-			default:
-				$search_flags = '';
-				$all = true;
-				break;
-
-		}
-
-		$sql_extra = $search_flags;
-		if(argv(1) === 'pending')
-			$sql_extra .= " and abook_ignored = 0 ";
-
-	}
-	else {
-		$sql_extra = " and abook_blocked = 0 ";
-		$unblocked = true;
-	}
-
-	$search = ((x($_REQUEST,'search')) ? notags(trim($_REQUEST['search'])) : '');
-
-	$tabs = array(
-		/*
-		array(
-			'label' => t('Suggestions'),
-			'url'   => z_root() . '/suggest', 
-			'sel'   => '',
-			'title' => t('Suggest new connections'),
-		),
-		*/
-
-		'pending' => array(
-			'label' => t('New Connections'),
-			'url'   => z_root() . '/connections/pending', 
-			'sel'   => ($pending) ? 'active' : '',
-			'title' => t('Show pending (new) connections'),
-		),
-
-		'all' => array(
-			'label' => t('All Connections'),
-			'url'   => z_root() . '/connections/all', 
-			'sel'   => ($all) ? 'active' : '',
-			'title' => t('Show all connections'),
-		),
-
-		/*
-		array(
-			'label' => t('Unblocked'),
-			'url'   => z_root() . '/connections',
-			'sel'   => (($unblocked) && (! $search) && (! $nets)) ? 'active' : '',
-			'title' => t('Only show unblocked connections'),
-		),
-		*/
-
-		'blocked' => array(
-			'label' => t('Blocked'),
-			'url'   => z_root() . '/connections/blocked',
-			'sel'   => ($blocked) ? 'active' : '',
-			'title' => t('Only show blocked connections'),
-		),
-
-		'ignored' => array(
-			'label' => t('Ignored'),
-			'url'   => z_root() . '/connections/ignored',
-			'sel'   => ($ignored) ? 'active' : '',
-			'title' => t('Only show ignored connections'),
-		),
-
-		'archived' => array(
-			'label' => t('Archived'),
-			'url'   => z_root() . '/connections/archived',
-			'sel'   => ($archived) ? 'active' : '',
-			'title' => t('Only show archived connections'),
-		),
-
-		'hidden' => array(
-			'label' => t('Hidden'),
-			'url'   => z_root() . '/connections/hidden',
-			'sel'   => ($hidden) ? 'active' : '',
-			'title' => t('Only show hidden connections'),
-		),
-
-//		array(
-//			'label' => t('Unconnected'),
-//			'url'   => z_root() . '/connections/unconnected',
-//			'sel'   => ($unconnected) ? 'active' : '',
-//			'title' => t('Only show one-way connections'),
-//		),
-
-
-	);
-
-	//$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) ? protect_sprintf(" AND xchan_name like '%$search_txt%' ") : "");
-
-	if($_REQUEST['gid']) {
-		$sql_extra .= " and xchan_hash in ( select xchan from group_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) ";
-	}
- 	
-	$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash 
-		where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ",
-		intval(local_channel())
-	);
-	if($r) {
-		App::set_pager_total($r[0]['total']);
-		$total = $r[0]['total'];
-	}
-
-	$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
-		WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d OFFSET %d ",
-		intval(local_channel()),
-		intval(App::$pager['itemspage']),
-		intval(App::$pager['start'])
-	);
-
-	$contacts = array();
-
-	if(count($r)) {
-
-		foreach($r as $rr) {
-			if($rr['xchan_url']) {
-
-				$status_str = '';
-				$status = array(
-					((intval($rr['abook_pending'])) ? t('Pending approval') : ''),
-					((intval($rr['abook_archived'])) ? t('Archived') : ''),
-					((intval($rr['abook_hidden'])) ? t('Hidden') : ''),
-					((intval($rr['abook_ignored'])) ? t('Ignored') : ''),
-					((intval($rr['abook_blocked'])) ? t('Blocked') : '')
-				);
-
-				foreach($status as $str) {
-					if(!$str)
-						continue;
-					$status_str .= $str;
-					$status_str .= ', ';
-				}
-				$status_str = rtrim($status_str, ', ');
-
-				$contacts[] = array(
-					'img_hover' => sprintf( t('%1$s [%2$s]'),$rr['xchan_name'],$rr['xchan_url']),
-					'edit_hover' => t('Edit connection'),
-					'delete_hover' => t('Delete connection'),
-					'id' => $rr['abook_id'],
-					'thumb' => $rr['xchan_photo_m'], 
-					'name' => $rr['xchan_name'],
-					'classes' => (intval($rr['abook_archived']) ? 'archived' : ''),
-					'link' => z_root() . '/connedit/' . $rr['abook_id'],
-					'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop',
-					'delete' => t('Delete'),
-					'url' => chanlink_url($rr['xchan_url']),
-					'webbie_label' => t('Channel address'),
-					'webbie' => $rr['xchan_addr'],
-					'network_label' => t('Network'),
-					'network' => network_to_name($rr['xchan_network']),
-					'public_forum' => ((intval($rr['xchan_pubforum'])) ? true : false),
-					'status_label' => t('Status'),
-					'status' => $status_str,
-					'connected_label' => t('Connected'),
-					'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'),
-					'approve_hover' => t('Approve connection'),
-					'approve' => (($rr['abook_pending']) ? t('Approve') : false),
-					'ignore_hover' => t('Ignore connection'),
-					'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false),
-					'recent_label' => t('Recent activity'),
-					'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id'])
-				);
-			}
-		}
-	}
-	
-
-	if($_REQUEST['aj']) {
-		if($contacts) {
-			$o = replace_macros(get_markup_template('contactsajax.tpl'),array(
-				'$contacts' => $contacts,
-				'$edit' => t('Edit'),
-			));
-		}
-		else {
-			$o = '<div id="content-complete"></div>';
-		}
-		echo $o;
-		killme();
-	}
-	else {
-		$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
-		$o .= replace_macros(get_markup_template('connections.tpl'),array(
-			'$header' => t('Connections') . (($head) ? ': ' . $head : ''),
-			'$tabs' => $tabs,
-			'$total' => $total,
-			'$search' => $search_hdr,
-			'$label' => t('Search'),
-			'$desc' => t('Search your connections'),
-			'$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""),
-			'$submit' => t('Find'),
-			'$edit' => t('Edit'),
-			'$cmd' => App::$cmd,
-			'$contacts' => $contacts,
-			'$paginate' => paginate($a),
-
-		)); 
-	}
-
-	if(! $contacts)
-		$o .= '<div id="content-complete"></div>';
-
-	return $o;
-}