Index: openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl,v
diff -u -N -r1.11.2.6 -r1.11.2.7
--- openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 5 Oct 2013 13:02:11 -0000 1.11.2.6
+++ openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 10 Oct 2013 21:00:45 -0000 1.11.2.7
@@ -59,7 +59,7 @@
specified name. 0 otherwise
} {
- if { $convert_p eq "t" } {
+ if { $convert_p == "t" } {
set attribute [plsql_utility::generate_oracle_name $orig_attribute]
} else {
set attribute $orig_attribute
@@ -71,7 +71,7 @@
and a.object_type = :object_type
} -default 0]
- if { $attr_exists_p || $convert_p eq "f" } {
+ if { $attr_exists_p || $convert_p == "f" } {
# If the attribute exists, o
return $attr_exists_p
}
@@ -574,7 +574,7 @@
where enum.attribute_id = :attribute_id
order by enum.sort_order
}]
- if {$required_p eq "f"} {
+ if {$required_p == "f"} {
# This is not a required option list... offer a default
lappend option_list [list " (no value) " ""]
}
Index: openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl,v
diff -u -N -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl 10 Jan 2007 21:22:06 -0000 1.5
+++ openacs-4/packages/acs-subsite/tcl/group-type-procs.tcl 10 Oct 2013 21:00:45 -0000 1.5.10.1
@@ -136,7 +136,7 @@
lappend plsql_drop [list remove_rel_types "delete from group_type_rels where group_type = :group_type"]
lappend plsql [list copy_rel_types [db_map copy_rel_types]]
- if { $execute_p eq "f" } {
+ if { $execute_p == "f" } {
set text "-- Create script"
foreach pair $plsql {
append text "[plsql_utility::parse_sql [lindex $pair 1]]\n\n"
Index: openacs-4/packages/acs-subsite/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.tcl,v
diff -u -N -r1.25.4.2 -r1.25.4.3
--- openacs-4/packages/acs-subsite/tcl/package-procs.tcl 5 Oct 2013 13:02:12 -0000 1.25.4.2
+++ openacs-4/packages/acs-subsite/tcl/package-procs.tcl 10 Oct 2013 21:00:45 -0000 1.25.4.3
@@ -312,7 +312,7 @@
lappend plsql [list "package" "create_package" [package_generate_spec $object_type]]
lappend plsql [list "package body" "create_package_body" [package_generate_body $object_type]]
- if { $debug_p eq "t" } {
+ if { $debug_p == "t" } {
foreach pair $plsql {
# append text "[plsql_utility::parse_sql [lindex $pair 1]]\n\n"
append text [lindex $pair 2]
@@ -475,7 +475,7 @@
@param start_with The highest parent object type for which to include attributes
@param object_type The object for which to create a package spec
} {
- if {$refresh_p eq "t"} {
+ if {$refresh_p == "t"} {
package_object_view_reset $object_type
}
return [util_memoize "package_object_view_helper -start_with $start_with $object_type"]
Index: openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl,v
diff -u -N -r1.2.10.2 -r1.2.10.3
--- openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl 5 Oct 2013 13:02:12 -0000 1.2.10.2
+++ openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl 10 Oct 2013 21:00:45 -0000 1.2.10.3
@@ -147,7 +147,7 @@
} {
- if { $include_object_id eq "t" } {
+ if { $include_object_id == "t" } {
set id [db_nextval "acs_object_id_seq"]
set suffix "_$id"
} else {
@@ -311,7 +311,7 @@
return ""
}
set return_value [join $this_columns ", "]
- if { $start_with_comma eq "t" } {
+ if { $start_with_comma == "t" } {
return ", $return_value"
}
return $return_value
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl,v
diff -u -N -r1.10.4.1 -r1.10.4.2
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 27 Aug 2013 12:20:36 -0000 1.10.4.1
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 10 Oct 2013 21:00:46 -0000 1.10.4.2
@@ -183,7 +183,7 @@
# The following create table statement commits the transaction. If it
# fails, we roll back what we've done
- if {$create_table_p eq "t"} {
+ if {$create_table_p == "t"} {
if {[catch {db_exec_plsql create_table "
create table $table_name (
rel_id constraint $fk_constraint_name
Index: openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl,v
diff -u -N -r1.3.10.4 -r1.3.10.5
--- openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 9 Sep 2013 16:44:19 -0000 1.3.10.4
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 10 Oct 2013 21:00:46 -0000 1.3.10.5
@@ -39,7 +39,7 @@
# Right now, we do not support multiple values for attributes
set max_n_values 1
-if {$required_p eq "t"} {
+if {$required_p == "t"} {
set min_n_values 1
} else {
set min_n_values 0
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl,v
diff -u -N -r1.2.10.4 -r1.2.10.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 9 Sep 2013 16:44:19 -0000 1.2.10.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 10 Oct 2013 21:00:46 -0000 1.2.10.5
@@ -24,7 +24,7 @@
return
}
-if {$dynamic_p ne "t" } {
+if {$dynamic_p != "t" } {
ad_return_error "Cannot administer group type" "Group type \"$group_type\" can only be administered by programmers"
}
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl,v
diff -u -N -r1.4.10.4 -r1.4.10.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 9 Sep 2013 16:44:19 -0000 1.4.10.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 10 Oct 2013 21:00:46 -0000 1.4.10.5
@@ -37,7 +37,7 @@
return
}
-if {$dynamic_p ne "t" } {
+if {$dynamic_p != "t" } {
ad_return_error "Cannot administer group type" "Group type \"$group_type\" can only be administered by programmers"
}
Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v
diff -u -N -r1.6.10.4 -r1.6.10.5
--- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 9 Sep 2013 16:44:21 -0000 1.6.10.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 10 Oct 2013 21:00:46 -0000 1.6.10.5
@@ -95,8 +95,8 @@
## constraint violations in the database because the constraints are enforced
## by triggers in the DB.
-if { $group_type_exact_p eq "f" && \
- [subsite::util::sub_type_exists_p $group_type] } {
+if { $group_type_exact_p == "f"
+ && [subsite::util::sub_type_exists_p $group_type] } {
# Sub rel-types exist... select one
set group_type_exact_p "t"
Index: openacs-4/packages/acs-subsite/www/admin/parties/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.tcl,v
diff -u -N -r1.6.10.4 -r1.6.10.5
--- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 9 Sep 2013 16:44:22 -0000 1.6.10.4
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 10 Oct 2013 21:00:46 -0000 1.6.10.5
@@ -143,8 +143,8 @@
}
-if { $party_type_exact_p eq "f" && \
- [subsite::util::sub_type_exists_p $party_type] } {
+if { $party_type_exact_p == "f"
+ && [subsite::util::sub_type_exists_p $party_type] } {
# Sub party-types exist... select one
set party_type_exact_p "t"
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v
diff -u -N -r1.10.10.4 -r1.10.10.5
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 9 Sep 2013 16:44:24 -0000 1.10.10.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 10 Oct 2013 21:00:46 -0000 1.10.10.5
@@ -25,14 +25,14 @@
add_party_url:onevalue
} -validate {
party_in_scope_p -requires {party_id:notnull} {
- if { $allow_out_of_scope_p eq "f" && \
- ![application_group::contains_party_p -party_id $party_id]} {
+ if { $allow_out_of_scope_p == "f"
+ && ![application_group::contains_party_p -party_id $party_id]} {
ad_complain "The party either does not exist or does not belong to this subsite."
}
}
rel_type_valid_p -requires {group_id:notnull rel_type:notnull exact_p:notnull} {
- if {$exact_p eq "t" && \
- ![relation_type_is_valid_to_group_p -group_id $group_id $rel_type]} {
+ if {$exact_p == "t"
+ && ![relation_type_is_valid_to_group_p -group_id $group_id $rel_type]} {
ad_complain "Relations of this type to this group would violate a relational constraint."
}
}
@@ -92,8 +92,8 @@
set member_state ""
}
-if { $exact_p eq "f" && \
- [subsite::util::sub_type_exists_p $rel_type] } {
+if { $exact_p == "f"
+ && [subsite::util::sub_type_exists_p $rel_type] } {
# Sub rel-types exist... select one
set exact_p "t"
@@ -202,7 +202,7 @@
# the list of parties that can be added to $group_id with a relation
# of type $rel_type.
- if {$allow_out_of_scope_p eq "f"} {
+ if {$allow_out_of_scope_p == "f"} {
set scope_query [db_map select_parties_scope_query]
set scope_clause "
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -N -r1.27.4.7 -r1.27.4.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 17 Sep 2013 22:24:40 -0000 1.27.4.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 10 Oct 2013 21:00:46 -0000 1.27.4.8
@@ -64,7 +64,7 @@
}
db_foreach path_select {} {
- if {$node_id != $root_id && $admin_p eq "t"} {
+ if {$node_id != $root_id && $admin_p == "t"} {
append head [subst {}]
}
if {$name eq ""} {
@@ -73,11 +73,11 @@
append head $name
}
- if {$node_id != $root_id && $admin_p eq "t"} {
+ if {$node_id != $root_id && $admin_p == "t"} {
append head ""
}
- if {$directory_p eq "t"} {
+ if {$directory_p == "t"} {
append head "/"
}
} if_no_rows {
@@ -210,7 +210,7 @@
if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue }
- if {$directory_p eq "t"} {
+ if {$directory_p == "t"} {
set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
if {$object_id eq ""} {
set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -N -r1.6.8.6 -r1.6.8.7
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 9 Sep 2013 17:25:31 -0000 1.6.8.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 10 Oct 2013 21:00:46 -0000 1.6.8.7
@@ -52,7 +52,7 @@
set user_id [ad_conn user_id]
db_foreach path_select {} {
- if {$node_id != $root_id && $admin_p eq "t"} {
+ if {$node_id != $root_id && $admin_p == "t"} {
append head ""
}
if {$name eq ""} {
@@ -61,11 +61,11 @@
append head $name
}
- if {$node_id != $root_id && $admin_p eq "t"} {
+ if {$node_id != $root_id && $admin_p == "t"} {
append head ""
}
- if {$directory_p eq "t"} {
+ if {$directory_p == "t"} {
append head "/"
}
} if_no_rows {
@@ -182,7 +182,7 @@
set permissions_url ""
if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue }
- if {$directory_p eq "t"} {
+ if {$directory_p == "t"} {
set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
if {$object_id eq ""} {
set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -N -r1.12.6.4 -r1.12.6.5
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 9 Sep 2013 16:44:25 -0000 1.12.6.4
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 10 Oct 2013 21:00:46 -0000 1.12.6.5
@@ -86,8 +86,8 @@
## constraint violations in the database because the constraints are enforced
## by triggers in the DB.
-if { $user_type_exact_p eq "f" && \
- [subsite::util::sub_type_exists_p $user_type] } {
+if { $user_type_exact_p == "f"
+ && [subsite::util::sub_type_exists_p $user_type] } {
# Sub user-types exist... select one
set user_type_exact_p "t"
@@ -243,7 +243,7 @@
}
- if { $email_verified_p eq "f" } {
+ if { $email_verified_p == "f" } {
set row_id [db_string user_new_2_rowid_for_email "select rowid from users where user_id = :user_id"]
# the user has to come back and activate their account
Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v
diff -u -N -r1.13.10.1 -r1.13.10.2
--- openacs-4/packages/acs-subsite/www/permissions/one.tcl 6 Sep 2013 16:01:47 -0000 1.13.10.1
+++ openacs-4/packages/acs-subsite/www/permissions/one.tcl 10 Oct 2013 21:00:46 -0000 1.13.10.2
@@ -42,7 +42,7 @@
db_1row context { *SQL* }
-if { $security_inherit_p eq "t" && $context_id ne "" } {
+if { $security_inherit_p == "t" && $context_id ne "" } {
lappend controls "Don't Inherit Permissions from [ad_quotehtml $context_name]"
} else {
lappend controls "Inherit Permissions from [ad_quotehtml $context_name]"
@@ -55,7 +55,7 @@
set show_children_url "one?[export_vars {object_id application_url {children_p t}}]"
set hide_children_url "one?[export_vars {object_id application_url {children_p f}}]"
-if {$children_p eq "t"} {
+if {$children_p == "t"} {
db_multirow children children { *SQL* } {
}
} else {
Index: openacs-4/packages/acs-subsite/www/pvt/alerts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.tcl,v
diff -u -N -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 10 Jan 2007 21:22:09 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 10 Oct 2013 21:00:47 -0000 1.5.10.1
@@ -49,7 +49,7 @@
order by bea.frequency" {
incr rownum
- if { $valid_p eq "f" } {
+ if { $valid_p == "f" } {
# alert has been disabled for some reason
set bboard_rows:$rownum(status) "disable"
set bboard_rows:$rownum(action_url) "/bboard/alert-reenable?rowid=[ns_urlencode $rowid]"
@@ -91,7 +91,7 @@
order by expires desc" {
incr rownum
- if { $valid_p eq "f" } {
+ if { $valid_p == "f" } {
# alert has been disabled for some reason
set classified_rows:$rownum(status) "Off"
set classified_rows:$rownum(action) "Re-enable"
Index: openacs-4/packages/acs-subsite/www/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.tcl,v
diff -u -N -r1.7.8.5 -r1.7.8.6
--- openacs-4/packages/acs-subsite/www/site-map/index.tcl 9 Sep 2013 17:25:31 -0000 1.7.8.5
+++ openacs-4/packages/acs-subsite/www/site-map/index.tcl 10 Oct 2013 21:00:47 -0000 1.7.8.6
@@ -46,7 +46,7 @@
set user_id [ad_conn user_id]
db_foreach path_select {} {
- if {$node_id != $root_id && $admin_p eq "t"} {
+ if {$node_id != $root_id && $admin_p == "t"} {
append head ""
}
if {$name eq ""} {
@@ -55,11 +55,11 @@
append head $name
}
- if {$node_id != $root_id && $admin_p eq "t"} {
+ if {$node_id != $root_id && $admin_p == "t"} {
append head ""
}
- if {$directory_p eq "t"} {
+ if {$directory_p == "t"} {
append head "/"
}
} if_no_rows {
@@ -149,7 +149,7 @@
if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue }
- if {$directory_p eq "t"} {
+ if {$directory_p == "t"} {
set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
if {$object_id eq ""} {
set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"