Merge remote-tracking branch 'upstream/master'

2 files changed, 2 insertions, 109 deletions

diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index ee34f0508..84fff5ed1 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,23 +1,12 @@
+$(document).ready(function() {
 
-function abook_perms_msg() {
-//	$('.abook-permsmsg').show();
-//	$('.abook-permschange').html(aStr['permschange']);
-//	$('.abook-permssave').show();
-}
-
-function abook_perms_new() {
-//	$('.abook-permsnew').show();
-//	$('.abook-permssave').show();
-}
-
+	$('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
 
-$(document).ready(function() {
 	if(typeof(after_following) !== 'undefined' && after_following) {
 		if(typeof(connectDefaultShare) !== 'undefined')
 			connectDefaultShare();
 		else
 			connectFullShare();
-		abook_perms_new();
 	}
 
 	$('#id_pending').click(function() {
@@ -25,16 +14,10 @@ $(document).ready(function() {
 			connectDefaultShare();
 		else
 			connectFullShare();
-		abook_perms_new();
 	});
 
-//	$('.abook-edit-me').click(function() {
-//		abook_perms_msg();
-//	});
-
 });
 
-
 function connectFullShare() {
 	$('.abook-edit-me').each(function() {
 		if(! $(this).is(':disabled'))
@@ -42,7 +25,6 @@ function connectFullShare() {
 	});
 	$('#me_id_perms_view_stream').attr('checked','checked');
 	$('#me_id_perms_view_profile').attr('checked','checked');
-	$('#me_id_perms_view_photos').attr('checked','checked');
 	$('#me_id_perms_view_contacts').attr('checked','checked');
 	$('#me_id_perms_view_storage').attr('checked','checked');
 	$('#me_id_perms_view_pages').attr('checked','checked');
@@ -54,85 +36,4 @@ function connectFullShare() {
 	$('#me_id_perms_view_storage').attr('checked','checked');
 	$('#me_id_perms_republish').attr('checked','checked');
 	$('#me_id_perms_post_like').attr('checked','checked');
-//	abook_perms_msg();
-}
-
-function connectCautiousShare() {
-	$('.abook-edit-me').each(function() {
-		if(! $(this).is(':disabled'))
-			$(this).removeAttr('checked');
-	});
-
-	$('#me_id_perms_view_stream').attr('checked','checked');
-	$('#me_id_perms_view_profile').attr('checked','checked');
-	$('#me_id_perms_view_photos').attr('checked','checked');
-	$('#me_id_perms_view_storage').attr('checked','checked');
-	$('#me_id_perms_view_pages').attr('checked','checked');
-	$('#me_id_perms_send_stream').attr('checked','checked');
-	$('#me_id_perms_post_comments').attr('checked','checked');
-	$('#me_id_perms_post_mail').attr('checked','checked');
-	$('#me_id_perms_post_like').attr('checked','checked');
-//	abook_perms_msg();
-
-}
-
-function connectForum() {
-	$('.abook-edit-me').each(function() {
-		if(! $(this).is(':disabled'))
-			$(this).removeAttr('checked');
-	});
-
-	$('#me_id_perms_view_stream').attr('checked','checked');
-	$('#me_id_perms_view_profile').attr('checked','checked');
-	$('#me_id_perms_view_photos').attr('checked','checked');
-	$('#me_id_perms_view_contacts').attr('checked','checked');
-	$('#me_id_perms_view_storage').attr('checked','checked');
-	$('#me_id_perms_view_pages').attr('checked','checked');
-	$('#me_id_perms_send_stream').attr('checked','checked');
-	$('#me_id_perms_post_wall').attr('checked','checked');
-	$('#me_id_perms_post_comments').attr('checked','checked');
-	$('#me_id_perms_post_mail').attr('checked','checked');
-	$('#me_id_perms_tag_deliver').attr('checked','checked');
-	$('#me_id_perms_republish').attr('checked','checked');
-	$('#me_id_perms_post_like').attr('checked','checked');
-//	abook_perms_msg();
-
 }
-
-function connectClear() {
-	$('.abook-edit-me').each(function() {
-		if(! $(this).is(':disabled'))
-			$(this).removeAttr('checked');
-	});
-//	abook_perms_msg();
-
-}
-
-function connectSoapBox() {
-	$('.abook-edit-me').each(function() {
-		if(! $(this).is(':disabled'))
-			$(this).removeAttr('checked');
-	});
-
-	$('#me_id_perms_view_stream').attr('checked','checked');
-	$('#me_id_perms_view_profile').attr('checked','checked');
-	$('#me_id_perms_view_photos').attr('checked','checked');
-	$('#me_id_perms_view_contacts').attr('checked','checked');
-	$('#me_id_perms_view_storage').attr('checked','checked');
-	$('#me_id_perms_view_pages').attr('checked','checked');
-//	abook_perms_msg();
-
-}
-
-
-function connectFollowOnly() {
-	$('.abook-edit-me').each(function() {
-		if(! $(this).is(':disabled'))
-			$(this).removeAttr('checked');
-	});
-
-	$('#me_id_perms_send_stream').attr('checked','checked');
-//	abook_perms_msg();
-
-}
-
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 5dac96940..e28a18b9f 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -46,7 +46,6 @@ function channel_privacy_macro(n) {
 	if(n == 0) {
 		$('#id_view_stream option').eq(0).attr('selected','selected');
 		$('#id_view_profile option').eq(0).attr('selected','selected');
-		$('#id_view_photos option').eq(0).attr('selected','selected');
 		$('#id_view_contacts option').eq(0).attr('selected','selected');
 		$('#id_view_storage option').eq(0).attr('selected','selected');
 		$('#id_view_pages option').eq(0).attr('selected','selected');
@@ -54,7 +53,6 @@ function channel_privacy_macro(n) {
 		$('#id_post_wall option').eq(0).attr('selected','selected');
 		$('#id_post_comments option').eq(0).attr('selected','selected');
 		$('#id_post_mail option').eq(0).attr('selected','selected');
-		$('#id_post_photos option').eq(0).attr('selected','selected');
 		$('#id_tag_deliver option').eq(0).attr('selected','selected');
 		$('#id_chat option').eq(0).attr('selected','selected');
 		$('#id_write_storage option').eq(0).attr('selected','selected');
@@ -69,7 +67,6 @@ function channel_privacy_macro(n) {
 	if(n == 1) {
 		$('#id_view_stream option').eq(1).attr('selected','selected');
 		$('#id_view_profile option').eq(1).attr('selected','selected');
-		$('#id_view_photos option').eq(1).attr('selected','selected');
 		$('#id_view_contacts option').eq(1).attr('selected','selected');
 		$('#id_view_storage option').eq(1).attr('selected','selected');
 		$('#id_view_pages option').eq(1).attr('selected','selected');
@@ -77,7 +74,6 @@ function channel_privacy_macro(n) {
 		$('#id_post_wall option').eq(1).attr('selected','selected');
 		$('#id_post_comments option').eq(1).attr('selected','selected');
 		$('#id_post_mail option').eq(1).attr('selected','selected');
-		$('#id_post_photos option').eq(1).attr('selected','selected');
 		$('#id_tag_deliver option').eq(1).attr('selected','selected');
 		$('#id_chat option').eq(1).attr('selected','selected');
 		$('#id_write_storage option').eq(1).attr('selected','selected');
@@ -92,7 +88,6 @@ function channel_privacy_macro(n) {
 	if(n == 2) {
 		$('#id_view_stream option').eq(7).attr('selected','selected');
 		$('#id_view_profile option').eq(7).attr('selected','selected');
-		$('#id_view_photos option').eq(7).attr('selected','selected');
 		$('#id_view_contacts option').eq(7).attr('selected','selected');
 		$('#id_view_storage option').eq(7).attr('selected','selected');
 		$('#id_view_pages option').eq(7).attr('selected','selected');
@@ -100,7 +95,6 @@ function channel_privacy_macro(n) {
 		$('#id_post_wall option').eq(1).attr('selected','selected');
 		$('#id_post_comments option').eq(2).attr('selected','selected');
 		$('#id_post_mail option').eq(1).attr('selected','selected');
-		$('#id_post_photos option').eq(0).attr('selected','selected');
 		$('#id_tag_deliver option').eq(1).attr('selected','selected');
 		$('#id_chat option').eq(1).attr('selected','selected');
 		$('#id_write_storage option').eq(0).attr('selected','selected');
@@ -115,7 +109,6 @@ function channel_privacy_macro(n) {
 	if(n == 3) {
 		$('#id_view_stream option').eq(7).attr('selected','selected');
 		$('#id_view_profile option').eq(7).attr('selected','selected');
-		$('#id_view_photos option').eq(7).attr('selected','selected');
 		$('#id_view_contacts option').eq(7).attr('selected','selected');
 		$('#id_view_storage option').eq(7).attr('selected','selected');
 		$('#id_view_pages option').eq(7).attr('selected','selected');
@@ -123,7 +116,6 @@ function channel_privacy_macro(n) {
 		$('#id_post_wall option').eq(5).attr('selected','selected');
 		$('#id_post_comments option').eq(5).attr('selected','selected');
 		$('#id_post_mail option').eq(5).attr('selected','selected');
-		$('#id_post_photos option').eq(2).attr('selected','selected');
 		$('#id_tag_deliver option').eq(1).attr('selected','selected');
 		$('#id_chat option').eq(5).attr('selected','selected');
 		$('#id_write_storage option').eq(2).attr('selected','selected');