provide a specific permission for liking profiles (reuse the obsolete bookmark permission), also remove the unused 'unconnected contacts' view for now.

3 files changed, 17 insertions, 17 deletions

diff --git a/mod/connections.php b/mod/connections.php
index b9df3c2b7..1875ed908 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -235,11 +235,11 @@ function connections_content(&$a) {
 				}
 				nav_set_selected('intros');
 				break;
-			case 'unconnected':
-				$search_flags = ABOOK_FLAG_UNCONNECTED;
-				$head = t('Unconnected');
-				$unconnected = true;
-				break;
+//			case 'unconnected':
+//				$search_flags = ABOOK_FLAG_UNCONNECTED;
+//				$head = t('Unconnected');
+//				$unconnected = true;
+//				break;
 
 			case 'all':
 				$head = t('All');
@@ -316,12 +316,12 @@ function connections_content(&$a) {
 			'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'),
-		),
+//		array(
+//			'label' => t('Unconnected'),
+//			'url'   => z_root() . '/connections/unconnected',
+//			'sel'   => ($unconnected) ? 'active' : '',
+//			'title' => t('Only show one-way connections'),
+//		),
 
 
 	);
diff --git a/mod/like.php b/mod/like.php
index f4feca279..916faf230 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -149,7 +149,7 @@ function like_content(&$a) {
 
 		$perms = get_all_perms($owner_uid,$observer['xchan_hash']);
 
-		if(! ($perms['post_wall'] && $perms['view_profile'])) {
+		if(! ($perms['post_like'] && $perms['view_profile'])) {
 			if($interactive) {
 				notice( t('Permission denied.') . EOL);
 				return $o;
diff --git a/mod/settings.php b/mod/settings.php
index 7a63e5fc4..e036755fc 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -309,7 +309,7 @@ function settings_post(&$a) {
 	$arr['channel_r_pages']     = (($_POST['view_pages'])    ? $_POST['view_pages']     : 0);
 	$arr['channel_w_pages']     = (($_POST['write_pages'])   ? $_POST['write_pages']    : 0);
 	$arr['channel_a_republish'] = (($_POST['republish'])     ? $_POST['republish']      : 0);
-	$arr['channel_a_bookmark'] = (($_POST['bookmark'])     ? $_POST['bookmark']      : 0);
+	$arr['channel_w_like']      = (($_POST['post_like'])     ? $_POST['post_like']      : 0);
 	
 	$defperms = 0;
 	if(x($_POST['def_view_stream']))
@@ -346,8 +346,8 @@ function settings_post(&$a) {
 		$defperms += $_POST['def_write_pages'];
 	if(x($_POST['def_republish']))
 		$defperms += $_POST['def_republish'];
-	if(x($_POST['def_bookmark']))
-		$defperms += $_POST['def_bookmark'];
+	if(x($_POST['def_post_like']))
+		$defperms += $_POST['def_post_like'];
 
 	$notify = 0;
 
@@ -405,7 +405,7 @@ function settings_post(&$a) {
 	set_pconfig(local_user(),'system','hide_online_status',$hide_presence);
 	set_pconfig(local_user(),'system','channel_menu',$channel_menu);
 
-	$r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_default_group = '%s', channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d, channel_a_republish = %d, channel_a_bookmark = %d, channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s'  where channel_id = %d limit 1",
+	$r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_default_group = '%s', channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d, channel_a_republish = %d, channel_w_like = %d, channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s'  where channel_id = %d limit 1",
 		dbesc($username),
 		intval($pageflags),
 		dbesc($timezone),
@@ -432,7 +432,7 @@ function settings_post(&$a) {
 		intval($arr['channel_r_pages']),
 		intval($arr['channel_w_pages']),
 		intval($arr['channel_a_republish']),
-		intval($arr['channel_a_bookmark']),
+		intval($arr['channel_w_like']),
 		dbesc($str_contact_allow),
 		dbesc($str_group_allow),
 		dbesc($str_contact_deny),