Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/contacts/tcl/contacts-procs.tcl 18 Aug 2004 17:31:03 -0000 1.1.2.2 +++ openacs-4/packages/contacts/tcl/contacts-procs.tcl 18 Aug 2004 20:03:11 -0000 1.1.2.3 @@ -323,13 +323,13 @@ } } if { [exists_and_not_null multiple_p] } { - if { $multiple_p } { + if { [string is true $multiple_p] } { append widget_string ",multiple" } } if { [exists_and_not_null nospell_p] } { - if { $nospell_p } { + if { [string is true $nospell_p] } { append widget_string ",nospell" } } @@ -347,7 +347,7 @@ } if { [exists_and_not_null help_p] } { - if { $help_p } { + if { [string is true $help_p] } { lappend temp_element "help" } } Index: openacs-4/packages/contacts/www/contact-archive.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/Attic/contact-archive.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/contacts/www/contact-archive.tcl 12 Aug 2004 17:38:41 -0000 1.1.2.1 +++ openacs-4/packages/contacts/www/contact-archive.tcl 18 Aug 2004 20:03:11 -0000 1.1.2.2 @@ -10,7 +10,7 @@ } -if { !$confirm_p } { +if { [string is false $confirm_p] } { set num_entries [llength $party_id] if { $num_entries == 0 } { Index: openacs-4/packages/contacts/www/contact-current.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/Attic/contact-current.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/contacts/www/contact-current.tcl 12 Aug 2004 17:38:41 -0000 1.1.2.1 +++ openacs-4/packages/contacts/www/contact-current.tcl 18 Aug 2004 20:03:11 -0000 1.1.2.2 @@ -10,7 +10,7 @@ } -if { !$confirm_p } { +if { [string is false $confirm_p] } { set num_entries [llength $party_id] if { $num_entries == 0 } { Index: openacs-4/packages/contacts/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/contacts/www/index.tcl 12 Aug 2004 17:38:41 -0000 1.1.2.1 +++ openacs-4/packages/contacts/www/index.tcl 18 Aug 2004 20:03:11 -0000 1.1.2.2 @@ -60,7 +60,7 @@ set categories_p [contacts::categories::enabled_p] -if { $categories_p } { +if { [string is true $categories_p] } { set category_select [contacts::categories::get_selects -export_vars $export_vars_category_form -category_id $temp_category_id] } Index: openacs-4/packages/contacts/www/admin/attribute-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/Attic/attribute-ae.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/contacts/www/admin/attribute-ae.tcl 12 Aug 2004 17:38:41 -0000 1.1.2.1 +++ openacs-4/packages/contacts/www/admin/attribute-ae.tcl 18 Aug 2004 20:03:11 -0000 1.1.2.2 @@ -45,7 +45,7 @@ {help_text:text(textarea),optional {label "Help Text"} {html {rows 3 cols 50}} {help_text {Text entered here will assist people in filling out forms by adding extra information, useful facts, etc. Just like this scentence assists in describing what the \"Help Text\" field is}}} } -if { $options_p && !$attr_exists_p } { +if { [string is true $options_p] && [string is false $attr_exists_p] } { ad_form -extend -name attribute_form -form { {options:text(textarea),nospell {label "Options"} {help_text "One option per line"} {html {cols 35 rows 6 wrap virtual}}} } @@ -57,7 +57,7 @@ } -edit_request { db_1row select_attribute_properties { select * from contact_attributes where attribute_id = :attribute_id } db_1row select_attribute_properties { select * from contact_attribute_names where attribute_id = :attribute_id and locale = :locale } - if { $options_p } { + if { [string is true $options_p] } { set options "" db_foreach get_options { select option from contact_attribute_options where attribute_id = :attribute_id } { append options "$option\r" @@ -93,7 +93,7 @@ :help_text ); } - if { $options_p } { + if { [string is true $options_p] } { set sort_order "1" set options [string trim $options] foreach option [split $options "\n"] { Index: openacs-4/packages/contacts/www/view/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/view/Attic/index.vuh,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/contacts/www/view/index.vuh 12 Aug 2004 17:38:42 -0000 1.1.2.1 +++ openacs-4/packages/contacts/www/view/index.vuh 18 Aug 2004 20:05:23 -0000 1.1.2.2 @@ -27,10 +27,8 @@ } } - - if { ![exists_and_not_null view_id] } { - if { !$error_p } { + if { [string is false $error_p] } { # there is no view_id but the party_id was valid, so we get the default view_id set object_type [contact::get::object_type $party_id] db_0or1row select_first_view_id { select view_id from contact_views where contact_object_type = :object_type order by sort_order limit 1 } @@ -40,7 +38,7 @@ } } } else { - if { [string is integer $view_id] && !$error_p } { + if { [string is integer $view_id] && [string is false $error_p] } { if { ![contacts::view::exists_p -object_type [contact::get::object_type $party_id] $view_id] } { set error_p 1 } @@ -51,7 +49,7 @@ } -if { $error_p } { +if { [string is true $error_p] } { ad_returnredirect -message "The URL you specified was invalid" [apm_package_url_from_id [ad_conn package_id]] } else { rp_form_put party_id $party_id