Index: openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl 7 Aug 2017 23:47:58 -0000 1.12 +++ openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl 7 Apr 2018 19:30:45 -0000 1.13 @@ -20,7 +20,7 @@ set page_title "Details for type $pretty_name" set context [list [list index "Object Type Index"] "Details for type $pretty_name"] -set page "[acs_object_type_hierarchy -object_type $object_type]" +set page [acs_object_type_hierarchy -object_type $object_type] append page [subst {

@@ -96,7 +96,7 @@ " } -if { ([info exists table_name] && $table_name ne "") } { +if { $table_name ne "" } { set body [db_string table_comment {} -default ""] Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/acs-subsite/www/user/password-update.tcl 21 Jan 2018 00:35:30 -0000 1.26 +++ openacs-4/packages/acs-subsite/www/user/password-update.tcl 7 Apr 2018 19:30:45 -0000 1.27 @@ -63,7 +63,7 @@ {message:text(hidden),optional} } -if { ([info exists old_password] && $old_password ne "") } { +if { $old_password ne "" } { set focus "update.password_1" } else { ad_form -extend -name update -form { @@ -92,7 +92,7 @@ } } -on_submit { - if { ([info exists old_password] && $old_password ne "") } { + if { $old_password ne "" } { set password_old $old_password } @@ -106,11 +106,14 @@ # Continue } old_password_bad { - if { (![info exists old_password] || $old_password eq "") } { + if { $old_password eq "" } { form set_error update password_old $result(password_message) } else { # This hack causes the form to reload as if submitted, but with the old password showing - ad_returnredirect [export_vars -base [ad_conn url] -entire_form -exclude { old_password } -override { { password_old $old_password } }] + ad_returnredirect [export_vars \ + -base [ad_conn url] \ + -entire_form -exclude { old_password } \ + -override { { password_old $old_password } }] ad_script_abort } break @@ -122,7 +125,7 @@ } # If old_password was supplied, handle authentication and log the user in - if { ([info exists old_password] && $old_password ne "") } { + if { $old_password ne "" } { # We use full-scale auth::authenticate here, in order to be sure we also get account-status checked # Hm. What if there's a problem with timing, so the password update doesn't take effect immediately? @@ -144,7 +147,7 @@ } } - if { ([info exists auth_info(account_url)] && $auth_info(account_url) ne "") } { + if { [info exists auth_info(account_url)] && $auth_info(account_url) ne "" } { ad_returnredirect $auth_info(account_url) ad_script_abort } Index: openacs-4/packages/acs-templating/tcl/data-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v diff -u -N -r1.22 -r1.23 --- openacs-4/packages/acs-templating/tcl/data-procs.tcl 4 Apr 2018 18:51:56 -0000 1.22 +++ openacs-4/packages/acs-templating/tcl/data-procs.tcl 7 Apr 2018 19:37:20 -0000 1.23 @@ -368,7 +368,7 @@ upvar 2 $message_ref message $value_ref textdate set error_msg [list] - if { ([info exists textdate] && $textdate ne "") } { + if { [info exists textdate] && $textdate ne "" } { if { [regexp {^[0-9]{4}-[0-9]{2}-[0-9]{2}$} $textdate match] } { if { [catch { clock scan "${textdate}" }] } { # the textdate is formatted properly the template::data::transform::textdate proc Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v diff -u -N -r1.54 -r1.55 --- openacs-4/packages/acs-templating/tcl/date-procs.tcl 7 Apr 2018 17:45:51 -0000 1.54 +++ openacs-4/packages/acs-templating/tcl/date-procs.tcl 7 Apr 2018 19:37:20 -0000 1.55 @@ -941,7 +941,7 @@ if { $mode ne "edit" } { set output {} - if { ([info exists value] && $value ne "") } { + if { $value ne "" } { append output "" append output [template::util::date::monthName $value $size] } Index: openacs-4/packages/acs-templating/tcl/deprecated-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/deprecated-procs.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-templating/tcl/deprecated-procs.tcl 5 Apr 2018 22:39:13 -0000 1.5 +++ openacs-4/packages/acs-templating/tcl/deprecated-procs.tcl 7 Apr 2018 19:37:20 -0000 1.6 @@ -249,7 +249,7 @@ set attributes(id) "richtext__$element(form_id)__$element(id)" - if { ([info exists element(htmlarea_p)] && $element(htmlarea_p) ne "") } { + if { [info exists element(htmlarea_p)] && $element(htmlarea_p) ne "" } { set htmlarea_p [template::util::is_true $element(htmlarea_p)] } else { set htmlarea_p [parameter::get \ Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v diff -u -N -r1.74 -r1.75 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 7 Apr 2018 17:45:51 -0000 1.74 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 7 Apr 2018 19:37:20 -0000 1.75 @@ -1244,7 +1244,7 @@ } # aggregate - if { ([info exists element_properties(aggregate)] && $element_properties(aggregate) ne "") } { + if { [info exists element_properties(aggregate)] && $element_properties(aggregate) ne "" } { # Set the aggregate_col to the name of the new, dynamic column set element_properties(aggregate_col) "$element_properties(name)___$element_properties(aggregate)" set element_properties(aggregate_group_col) "$element_properties(name)___$element_properties(aggregate)_group" @@ -1285,7 +1285,7 @@ } # aggregate - if { ([info exists __element_properties(aggregate)] && $__element_properties(aggregate) ne "") } { + if { [info exists __element_properties(aggregate)] && $__element_properties(aggregate) ne "" } { # Update totals incr __agg_counter($__element_properties(name)) if {$__element_properties(aggregate) eq "sum" } { @@ -1395,7 +1395,7 @@ # Set the URLs which the next/prev page/group links should point to foreach elm { next_page previous_page next_group previous_group } { - if { ([info exists paginator($elm)] && $paginator($elm) ne "") } { + if { [info exists paginator($elm)] && $paginator($elm) ne "" } { set paginator(${elm}_url) [get_url \ -name $list_properties(name) \ -override [list [list page $paginator($elm)]]] @@ -1744,7 +1744,7 @@ } # Generate add_url, and add to filter(add_urls) - if { ([info exists filter_properties(add_url_eval)] && $filter_properties(add_url_eval) ne "") } { + if { [info exists filter_properties(add_url_eval)] && $filter_properties(add_url_eval) ne "" } { upvar $list_properties(ulevel) __filter_value __filter_value set __filter_value $value lappend filter_properties(add_urls) [uplevel $list_properties(ulevel) subst $filter_properties(add_url_eval)] Index: openacs-4/packages/acs-templating/tcl/paginator-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/paginator-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/acs-templating/tcl/paginator-procs.tcl 28 Mar 2018 07:46:21 -0000 1.26 +++ openacs-4/packages/acs-templating/tcl/paginator-procs.tcl 7 Apr 2018 19:37:20 -0000 1.27 @@ -715,7 +715,7 @@ # If the paginator is contextual, set the context if { [info exists properties(context_ids)] } { foreach elm { next_page previous_page next_group previous_group } { - if { ([info exists info($elm)] && $info($elm) ne "") } { + if { [info exists info($elm)] && $info($elm) ne "" } { set info(${elm}_context) [lindex $properties(context_ids) $info($elm)-1] } } Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl 1 Oct 2017 12:16:05 -0000 1.20 +++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl 7 Apr 2018 19:37:20 -0000 1.21 @@ -106,7 +106,7 @@ } set error_p 0 # check file name - if { [info exists f_url] && $f_url eq "" && $url_ok_btn ne ""} { + if { $f_url eq "" && $url_ok_btn ne ""} { template::form::set_error upload_form f_url "Specify a [_ acs-templating.Link_Url]" set error_p 1 } @@ -226,7 +226,7 @@ # see the parent object set f_href "/image/${item_id}/private/${parent_id}/${file_name}" } else { - if { ([info exists f_url] && $f_url ne "") && $url_ok_btn ne "" } { + if { $f_url ne "" && $url_ok_btn ne "" } { set f_href $f_url } else { set f_href "/file/${item_id}/${file_name}"