simplify

4 files changed, 18 insertions, 52 deletions

diff --git a/mod/contacts.php b/mod/contacts.php
index a4a1b9d36..008a6892a 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -42,7 +42,6 @@ function contacts_init(&$a) {
 
 	$a->page['aside'] .= findpeople_widget();
 
-	$a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
 	$base = $a->get_baseurl();
 
 	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
diff --git a/mod/network.php b/mod/network.php
index 99c0f746f..4fdbe0ecb 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -95,7 +95,7 @@ function network_init(&$a) {
 
 	$a->page['aside'] .= group_side('network','network',true,$group_id);
 	$a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);	
-	$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
+
 	$a->page['aside'] .= saved_searches($search);
 	$a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
 
@@ -128,7 +128,6 @@ function saved_searches($search) {
 		. ((x($_GET,'cid'))   ? '&cid='   . $_GET['cid']   : '') 
 		. ((x($_GET,'star'))  ? '&star='  . $_GET['star']  : '')
 		. ((x($_GET,'conv'))  ? '&conv='  . $_GET['conv']  : '')
-		. ((x($_GET,'nets'))  ? '&nets='  . $_GET['nets']  : '')
 		. ((x($_GET,'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
 		. ((x($_GET,'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
 		. ((x($_GET,'file'))  ? '&file='  . $_GET['file']  : '');
@@ -353,7 +352,6 @@ function network_content(&$a, $update = 0) {
 	$liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
 	$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
 	$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
-	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
 	$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
 	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
 	$file = ((x($_GET,'file')) ? $_GET['file'] : '');
@@ -365,19 +363,6 @@ function network_content(&$a, $update = 0) {
 	if($cid)
 		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
-	if($nets) {
-		$r = q("select id from contact where uid = %d and network = '%s' and self = 0",
-			intval(local_user()),
-			dbesc($nets)
-		);
-
-		$str = '';
-		if(count($r))
-			foreach($r as $rr)
-				$str .= '<' . $rr['id'] . '>';
-		if(strlen($str))
-			$def_acl = array('allow_cid' => $str);
-	}
 
 	if(! $update) {
 
@@ -407,15 +392,6 @@ function network_content(&$a, $update = 0) {
 		if($search)
 			$o .= '<h2>' . t('Search Results For:') . ' '  . htmlspecialchars($search) . '</h2>';
 
-		if($group) {
-			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
-				notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
-									'Warning: This group contains %s members from an insecure network.',
-									$t), $t ) . EOL);
-				notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
-			}
-		}
-
 		nav_set_selected('network');
 
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
@@ -427,7 +403,7 @@ function network_content(&$a, $update = 0) {
 			'nickname' => $a->user['nickname'],
 			'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
 			'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
-			'bang' => (($group || $cid || $nets) ? '!' : ''),
+			'bang' => (($group || $cid) ? '!' : ''),
 			'visitor' => 'block',
 			'profile_uid' => local_user()
 		);
@@ -444,7 +420,7 @@ function network_content(&$a, $update = 0) {
 	
 	$sql_options  = (($star) ? " and starred = 1 " : '');
 
-	$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : '');
+	$sql_nets = '';
 
 	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
 
@@ -515,7 +491,6 @@ function network_content(&$a, $update = 0) {
 			. ((x($_GET,'liked'))  ? '&liked='  . $_GET['liked']  : '') 
 			. ((x($_GET,'conv'))   ? '&conv='   . $_GET['conv']   : '') 
 			. ((x($_GET,'spam'))   ? '&spam='   . $_GET['spam']   : '') 
-			. ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
 			. ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
 			. ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
 			. ((x($_GET,'file'))   ? '&file='   . $_GET['file']   : '') 
@@ -538,7 +513,6 @@ function network_content(&$a, $update = 0) {
 		
 				. 'var network_search = "' . $_GET['search'] . '"' . ";\r\n"
 				. 'var network_order = "' . $_GET['order'] . '"' . ";\r\n"
-				. 'var network_nets = "' . $_GET['nets'] . '"' . ";\r\n"
 				. 'var network_file = "' . $_GET['file'] . '"' . ";\r\n"
 				. 'var network_date_end = "' . $datequery . '"' . ";\r\n"
 				. 'var network_date_start = "' . $datequery2 . '"' . ";\r\n"
diff --git a/mod/poke.php b/mod/poke.php
index f4660e624..9cff0262e 100755
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -28,6 +28,8 @@ function poke_init(&$a) {
 		return;
 
 
+	$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
+
 	logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
 
 
@@ -62,13 +64,14 @@ function poke_init(&$a) {
 	$arr['author-link']   = $poster['url'];
 	$arr['author-avatar'] = $poster['thumb'];
 	$arr['title']         = '';
-	$arr['allow_cid']     = $a->user['allow_cid'];
-	$arr['allow_gid']     = $a->user['allow_gid'];
-	$arr['deny_cid']      = $a->user['deny_cid'];
-	$arr['deny_gid']      = $a->user['deny_gid'];
+	$arr['allow_cid']     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+	$arr['allow_gid']     = (($private) ? '' : $a->user['allow_gid']);
+	$arr['deny_cid']      = (($private) ? '' : $a->user['deny_cid']);
+	$arr['deny_gid']      = (($private) ? '' : $a->user['deny_gid']);
 	$arr['last-child']    = 1;
 	$arr['visible']       = 1;
 	$arr['verb']          = $activity;
+	$arr['private']       = $private;
 	$arr['object-type']   = ACTIVITY_OBJ_PERSON;
 
 	$arr['origin']        = 1;
@@ -150,8 +153,8 @@ EOT;
 
 	$shortlist = array();
 	foreach($verbs as $k => $v)
-		$shortlist[] = array($k,$v[1]);
-
+		if($v[1] !== 'NOTRANSLATION')
+			$shortlist[] = array($k,$v[1]);
 
 	$tpl = get_markup_template('poke_content.tpl');
 
@@ -161,6 +164,7 @@ EOT;
 		'$clabel' => t('Recipient'),
 		'$choice' => t('Choose what you wish to do to recipient'),
 		'$verbs' => $shortlist,
+		'$prv_desc' => t('Make this post private'),
 		'$submit' => t('Submit'),
 		'$name' => $name,
 		'$id' => $id
diff --git a/mod/register.php b/mod/register.php
index d52b5a6e1..d48a7086d 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -202,24 +202,13 @@ function register_content(&$a) {
 	$photo        = ((x($_POST,'photo'))        ? $_POST['photo']        : ((x($_GET,'photo'))        ? hex2bin($_GET['photo'])        : ''));
 	$invite_id    = ((x($_POST,'invite_id'))    ? $_POST['invite_id']    : ((x($_GET,'invite_id'))    ? $_GET['invite_id']             : ''));
 
-	$noid = get_config('system','no_openid');
 
-	if($noid) {
-		$oidhtml = '';
-		$fillwith = '';
-		$fillext = '';
-		$oidlabel = '';
-	}
-	else {
-		$oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
-		$fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
-		$fillext =  t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
-		$oidlabel = t("Your OpenID \x28optional\x29: ");
-	}
-
-	// I set this and got even more fake names than before...
+	$oidhtml = '';
+	$fillwith = '';
+	$fillext = '';
+	$oidlabel = '';
 
-	$realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
+	$realpeople = ''; 
 
 	if(get_config('system','publish_all')) {
 		$profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';