Index: openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	10 Sep 2015 08:21:49 -0000	1.14.2.1
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl	3 Jul 2016 14:39:34 -0000	1.14.2.2
@@ -5,7 +5,6 @@
 # user_add_url: URL to the page for adding users
 
 set user_id [ad_conn user_id]
-
 set admin_p [permission::permission_p -object_id $object_id -privilege admin]
 
 if { (![info exists return_url] || $return_url eq "") } {
@@ -33,8 +32,9 @@
 }
 
 foreach priv $privs { 
-    lappend select_clauses "sum(ptab.${priv}_p) as ${priv}_p"
-    lappend select_clauses "(case when sum(ptab.${priv}_p) > 0 then 'checked' else '' end) as ${priv}_checked"
+    lappend select_clauses \
+        "sum(ptab.${priv}_p) as ${priv}_p" \
+        "(case when sum(ptab.${priv}_p) > 0 then 'checked' else '' end) as ${priv}_checked"
     lappend from_all_clauses "(case when privilege='${priv}' then 2 else 0 end) as ${priv}_p"
     lappend from_direct_clauses "(case when privilege='${priv}' then -1 else 0 end) as ${priv}_p"
     lappend from_dummy_clauses "0 as ${priv}_p"
@@ -43,14 +43,14 @@
         [list \
              html { align center } \
              label [string totitle [string map {_ { }} [_ acs-subsite.$priv]]] \
-             display_template "
+             display_template [subst {
                <if @permissions.${priv}_p@ ge 2>
-                 <img src=\"/shared/images/checkboxchecked.gif\" style=\"border:0\" height=\"13\" width=\"13\" alt=\"X\" title=\"This permission is inherited, to remove, click the 'Do not inherit ...' button above.\">
+                 <img src="/shared/images/checkboxchecked.gif" style="border:0" height="13" width="13" alt="X" title="This permission is inherited, to remove, click the 'Do not inherit ...' button above.">
                </if>
                <else>
-                 <input type=\"checkbox\" name=\"perm\" value=\"@permissions.grantee_id@,${priv}\" @permissions.${priv}_checked@>
+                 <input type="checkbox" name="perm" value="@permissions.grantee_id@,${priv}" @permissions.${priv}_checked@>
                </else>
-             " \
+             }] \
             ]
 }
 
@@ -65,22 +65,34 @@
 
 set perm_url "[ad_conn subsite_url]permissions/"
 
-if { (![info exists user_add_url] || $user_add_url eq "") } {
+if { ![info exists user_add_url] || $user_add_url eq "" } {
     set user_add_url "${perm_url}perm-user-add"
 }
-set user_add_url [export_vars -base $user_add_url { object_id expanded {return_url "[ad_return_url]"}}]
+set user_add_url [export_vars -base $user_add_url {
+    object_id expanded {return_url "[ad_return_url]"}
+}]
 
 set actions [list \
-                 [_ acs-subsite.Grant_Permission] [export_vars -base "${perm_url}grant" {return_url application_url object_id}] [_ acs-subsite.Grant_Permission] \
-                 [_ acs-subsite.Search_For_Exist_User] $user_add_url [_ acs-subsite.Search_For_Exist_User]]
+                 [_ acs-subsite.Grant_Permission] \
+                 [export_vars -base "${perm_url}grant" {return_url application_url object_id}] \
+                 [_ acs-subsite.Grant_Permission] \
+                 [_ acs-subsite.Search_For_Exist_User] \
+                 $user_add_url \
+                 [_ acs-subsite.Search_For_Exist_User]]
 
 if { $context_id ne "" } {
     set inherit_p [permission::inherit_p -object_id $object_id]
 
     if { $inherit_p } {
-        lappend actions "[_ acs-subsite.lt_Do_not_inherit_from_p]" [export_vars -base "${perm_url}toggle-inherit" {object_id {return_url [ad_return_url]}}] "[_ acs-subsite.lt_Stop_inheriting_permi]"
+        lappend actions \
+            [_ acs-subsite.lt_Do_not_inherit_from_p] \
+            [export_vars -base "${perm_url}toggle-inherit" {object_id {return_url [ad_return_url]}}] \
+            [_ acs-subsite.lt_Stop_inheriting_permi]
     } else {
-        lappend actions "[_ acs-subsite.lt_Inherit_from_parent_o]" [export_vars -base "${perm_url}toggle-inherit" {object_id {return_url [ad_return_url]}}] "[_ acs-subsite.lt_Inherit_permissions_f]"
+        lappend actions \
+            [_ acs-subsite.lt_Inherit_from_parent_o] \
+            [export_vars -base "${perm_url}toggle-inherit" {object_id {return_url [ad_return_url]}}] \
+            [_ acs-subsite.lt_Inherit_permissions_f]
     }
 }
 
@@ -95,9 +107,7 @@
 
 
 set perm_form_export_vars [export_vars -form {object_id privs return_url}]
-
 set perm_modify_url "${perm_url}perm-modify"
-
 set application_group_id [application_group::group_id_from_package_id -package_id [ad_conn subsite_id]]
 
 # PERMISSION: yes = 2, no = 0