From b2298d44a4126ba0b7f0355733bb1125c656bac1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 Aug 2016 14:45:06 +0200
Subject: multi acl: port /settings

---
 Zotlabs/Module/Settings.php | 6 +++++-
 view/js/acl.js              | 2 --
 view/tpl/settings.tpl       | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index 57a0aa535..12157944f 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -1220,6 +1220,10 @@ class Settings extends \Zotlabs\Web\Controller {
 				'$permissions' => t('Default Post and Publish Permissions'),
 				'$permdesc' => t("\x28click to open/close\x29"),
 				'$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
+				'$allow_cid' => acl2json($perm_defaults['allow_cid']),
+				'$allow_gid' => acl2json($perm_defaults['allow_gid']),
+				'$deny_cid' => acl2json($perm_defaults['deny_cid']),
+				'$deny_gid' => acl2json($perm_defaults['deny_gid']),
 				'$suggestme' => $suggestme,
 				'$group_select' => $group_select,
 				'$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()),
@@ -1282,7 +1286,7 @@ class Settings extends \Zotlabs\Web\Controller {
 	
 			call_hooks('settings_form',$o);
 	
-			$o .= '</form>' . "\r\n";
+			//$o .= '</form>' . "\r\n";
 	
 			return $o;
 		}
diff --git a/view/js/acl.js b/view/js/acl.js
index a1af5f4f0..2ba7ea46a 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -97,8 +97,6 @@ ACL.prototype.on_submit = function() {
 		that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});
 
-	//areYouSure jquery plugin: recheck the form here
-	$('form').trigger('checkform.areYouSure');
 };
 
 ACL.prototype.search = function() {
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 8157196ac..0ec44e9ff 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -5,7 +5,7 @@
 		<div class="clear"></div>
 	</div>
 	{{$nickname_block}}
-	<form action="settings" id="settings-form" method="post" autocomplete="off" >
+	<form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
 		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
 			<div class="panel">
@@ -72,7 +72,6 @@
 							{{/if}}
 							<div id="settings-default-perms" class="form-group" >
 								<button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
-								{{$aclselect}}
 							</div>
 							{{$group_select}}
 							{{include file="field_checkbox.tpl" field=$hide_presence}}
@@ -174,4 +173,5 @@
 			</div>
 		</div>
 	</form>
+	{{$aclselect}}
 </div>
-- 
cgit v1.2.3