Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.xql 7 Aug 2017 23:47:59 -0000 1.7
+++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.xql 17 Jan 2019 17:02:00 -0000 1.8
@@ -9,21 +9,21 @@
where object_id = :object_id
-
+
update acs_objects
set security_inherit_p = 't'
where object_id = :object_id
-
+
update acs_objects
set security_inherit_p = 'f'
where object_id = :object_id
-
+
Index: openacs-4/packages/acs-tcl/tcl/exception-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/exception-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 25 Jul 2018 01:39:50 -0000 1.10
+++ openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 17 Jan 2019 17:02:00 -0000 1.11
@@ -9,7 +9,7 @@
#
# In Tcl 8.5, "::try" was not yet a built-in of Tcl
#
- package require try
+ package require try
}
if {[info commands "::try"] eq ""} {
error "This version of OpenACS requires the ::try command (built-in in 8.6+, package for 8.5"
@@ -32,7 +32,7 @@
Check if the exception was caused by ad_raise (i.e. was an OpenACS
exception)
-
+
@return ad_exception value or empty, in case the exception had other causes
} {
lassign $errorCode flag type value
@@ -46,13 +46,13 @@
#
# Tcl 8.6 (or newer) variant of ad_try
#
-
+
ad_proc ad_try {
{-auto_abort:boolean true}
body
args
} {
-
+
Generic code for OpenACS to handle exceptions and traps based on
Tcl's primitives. This implementation is a slight generalization
of the Tcl 8.6 built-in ::try, which handles ad_script_aborts
@@ -64,9 +64,9 @@
"with_finally" and "with_catch" obsolete, which should be marked
as deprecated in the not-to-far future.
- @see with_finally
+ @see with_finally
@see with_catch
-
+
} {
#
# Per default, ad_script_abort exceptions are automatically passed
@@ -90,10 +90,10 @@
# Call the Tcl 8.6 built-in/compliant ::try in the scope of the caller
#
#puts stderr EXEC=[list ::try $body {*}$extraTraps {*}$args]
-
+
tailcall ::try $body {*}$extraTraps {*}$args
}
-
+
} else {
# version for Tcl 8.5
@@ -102,7 +102,7 @@
body
args
} {
-
+
Generic code for OpenACS to handle exceptions and traps based on
Tcl's primitives. This implementation is a slight generalization
of the Tcl 8.6 built-in ::try, which handles ad_script_aborts
@@ -114,9 +114,9 @@
"with_finally" and "with_catch" obsolete, which should be marked
as deprecated in the not-to-far future.
- @see with_finally
+ @see with_finally
@see with_catch
-
+
} {
#
# Per default, ad_script_abort exceptions are automatically passed
@@ -140,7 +140,7 @@
# Call the Tcl 8.6 built-in/compliant ::try in the scope of the caller
#
#puts stderr EXEC=[list ::try $body {*}$extraTraps {*}$args]
-
+
#uplevel [list ::try $body {*}$extraTraps {*}$args]
if {[catch {uplevel [list ::try $body {*}$extraTraps {*}$args]} msg opts]} {
@@ -149,7 +149,7 @@
} else {
return $msg
}
- }
+ }
}
# Local variables:
Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 25 Apr 2018 08:46:13 -0000 1.10
+++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 17 Jan 2019 17:02:00 -0000 1.11
@@ -15,7 +15,7 @@
Change the state of a membership relation
} {
db_transaction {
-
+
# We need the id of the user that we are changing state for
set rel_user_id [get_user_id -rel_id $rel_id]
@@ -31,22 +31,22 @@
"approved" { db_exec_plsql approve {} }
"banned" { db_exec_plsql ban {} }
"rejected" { db_exec_plsql reject {} }
- "deleted" {
- db_exec_plsql delete {}
-
+ "deleted" {
+ db_exec_plsql delete {}
+
# Add user to public group - see bug 1468
group::add_member \
-no_perm_check \
-group_id [acs_magic_object the_public] \
- -user_id $rel_user_id
+ -user_id $rel_user_id
}
"needs approval" { db_exec_plsql unapprove {} }
"merged" { db_exec_plsql merge {} }
}
# Record who changed the state
# This will trigger an update of the acs_objects.modified_date column.
- # We use this in the ApprovalExpiration feature to make sure that a user isn't
+ # We use this in the ApprovalExpiration feature to make sure that a user isn't
# bumped back to needs_approval right after an administrator has approved them,
# even if the user doesn't log in the meantime.
@@ -108,11 +108,11 @@
} {
Return the user_id of a rel_id
} {
- db_1row select_rel_id {
+ db_1row select_rel_id {
select u.user_id, r.object_id_one as group_id
from acs_rels r,
users u
- where r.rel_id = :rel_id
+ where r.rel_id = :rel_id
and u.user_id = r.object_id_two
}
return [list user_id $user_id group_id $group_id]
@@ -125,7 +125,7 @@
} {
return [dict get [get -rel_id $rel_id] user_id]
}
-
+
ad_proc -public get_group_id {
{-rel_id:required}
} {