Index: openacs-4/packages/edit-this-page/tcl/etp-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/edit-this-page/tcl/etp-procs.tcl 6 Sep 2013 15:27:55 -0000 1.20 +++ openacs-4/packages/edit-this-page/tcl/etp-procs.tcl 7 Sep 2013 12:50:57 -0000 1.21 @@ -169,7 +169,7 @@ } { variable application_params - if { [empty_string_p $app] } { + if { $app eq "" } { set app [parameter::get -parameter application -default "default"] } @@ -212,7 +212,7 @@ Returns the content_type specified in the package parameters. } { - if { $name == "index" } { + if { $name eq "index" } { set content_type [etp::get_application_param index_content_type] } else { set content_type [etp::get_application_param content_content_type] @@ -263,7 +263,7 @@ set max_age [parameter::get -parameter cache_max_age -default edit-this-page] -if {![exists_and_not_null package_id]} { +if {(![info exists package_id] || $package_id eq "")} { set package_id [ad_conn package_id] } set name [etp::get_name] @@ -286,7 +286,7 @@ # Page not found. Redirect admins to setup page; # otherwise report 404 error. - if { $name == "index" && + if { $name eq "index" && [permission::permission_p -object_id [ad_conn package_id] -privilege admin] } { # set up the new content section ad_returnredirect "etp-setup-2" @@ -317,23 +317,23 @@ set extended_attributes [get_ext_attribute_columns $content_type] set revision_id [ad_conn revision_id] - if {[empty_string_p $revision_id]} { + if {$revision_id eq ""} { # this will throw an error if the page does not exist db_1row get_page_attributes "" -column_array pa } else { # revision_id was set by index.vuh db_1row get_page_attributes_other_revision "" -column_array pa } - if {[empty_string_p $pa(mime_type)]} { + if {$pa(mime_type) eq ""} { set pa(mime_type) "text/html" } - if {![string equal "text/html" $pa(mime_type)]} { + if {"text/html" ne $pa(mime_type) } { set pa(content) [template::util::richtext get_property html_value [list $pa(content) $pa(mime_type)]] } # add in the context bar - if { $name == "index" } { + if { $name eq "index" } { set cb [ad_context_bar] set context [list] } else { @@ -345,7 +345,7 @@ regsub {^Your Workspace : } $cb "" cb - if {[lindex $cb 1] == "Your Workspace"} { + if {[lindex $cb 1] eq "Your Workspace"} { set cb [lreplace $cb 0 1] } set pa(context_bar) $cb @@ -362,8 +362,8 @@ on the live revision id, not on the item id. } { set extended_attributes "" - if { ![empty_string_p $content_type] && - ![string equal $content_type "etp_page_revision"] } { + if { $content_type ne "" && + $content_type ne "etp_page_revision" } { variable content_types set attributes $content_types($content_type) @@ -438,7 +438,7 @@ # which are set up with etp application parameters set attr_name [lindex $attribute_desc 0] if { [lsearch -exact { title description content } $attr_name] != -1 } { - if { $page_name == "index" } { + if { $page_name eq "index" } { set param_name "index_${attr_name}_attr_name" } else { set param_name "content_${attr_name}_attr_name" @@ -475,10 +475,10 @@ set lookup_sql [db_map lookup_sql_clause] # see if a select-list callback function was specified - if { [info commands $default] != "" } { + if { [info commands $default] ne "" } { set transformed_lookup_sql [eval $default transform_during_query $attribute_id {$lookup_sql}] - if {$transformed_lookup_sql != ""} { + if {$transformed_lookup_sql ne ""} { set lookup_sql $transformed_lookup_sql } } @@ -503,8 +503,8 @@ set url_stub [ns_conn url] array set site_node [site_node::get -url $url_stub] set urlc [regexp -all "/" $url_stub] - if { ($site_node(package_key) == "edit-this-page" || - $site_node(package_key) == "acs-subsite") && + if { ($site_node(package_key) eq "edit-this-page" || + $site_node(package_key) eq "acs-subsite") && [permission::permission_p -object_id [ad_conn package_id] -privilege write] } { set name [etp::get_name] @@ -535,7 +535,7 @@ } { set etp_url [get_etp_url] - if { ![empty_string_p $etp_url] } { + if { $etp_url ne "" } { return "Edit This Page\n" } return {} @@ -548,7 +548,7 @@ Returns the canonical page name for the current request. } { set url_stub [ad_conn url] - if { [string index $url_stub end] == "/" } { + if { [string index $url_stub end] eq "/" } { set name index } else { set name [file rootname [file tail $url_stub]] @@ -610,7 +610,7 @@ and currently is never cached. } { - if ![exists_and_not_null package_id] { + if {(![info exists package_id] || $package_id eq "")} { set package_id [ad_conn package_id] } set content_type [etp::get_content_type] @@ -628,31 +628,31 @@ for {set i 0} {$i < [llength $args]} {incr i} { set arg [lindex $args $i] - if { $arg == "-result_name" } { + if { $arg eq "-result_name" } { incr i set result_name [lindex $args $i] } - if { $arg == "-package_id" } { + if { $arg eq "-package_id" } { incr i set package_id [lindex $args $i] set app [parameter::get -package_id $package_id -parameter application -default default] set content_type [etp::get_application_param content_content_type $app] } - if { $arg == "-orderby" } { + if { $arg eq "-orderby" } { incr i set orderby [lindex $args $i] continue } - if { $arg == "-limit" } { + if { $arg eq "-limit" } { incr i set limit_clause "limit [lindex $args $i]" continue } - if { $arg == "-where" } { + if { $arg eq "-where" } { incr i set extra_where_clauses [lindex $args $i] continue @@ -663,7 +663,7 @@ } else { ns_log debug "get_content_items: extended attribute named $arg" set attr_desc [etp::get_attribute_desc $arg $content_type] - if { ![empty_string_p $attr_desc] } { + if { $attr_desc ne "" } { ns_log debug "get_content_items: adding it" set lookup_sql [etp::get_attribute_lookup_sql $attr_desc] append columns ",\n $lookup_sql" Index: openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl 13 Jan 2005 13:58:04 -0000 1.5 +++ openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl 7 Sep 2013 12:50:57 -0000 1.6 @@ -102,7 +102,7 @@ We are allowed to add/modify the elements for the search compatible datasource array via upvar } { - if {[exists_and_not_null array_name]} { + if {([info exists array_name] && $array_name ne "")} { upvar search_array $array_name ns_log debug "etp::search::etp_page_revision: arrayname:$array_name" } Index: openacs-4/packages/edit-this-page/templates/news-index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/templates/news-index.tcl 18 Nov 2001 18:57:58 -0000 1.2 +++ openacs-4/packages/edit-this-page/templates/news-index.tcl 7 Sep 2013 12:50:57 -0000 1.3 @@ -19,7 +19,7 @@ content_pages:multirow } -if { $archive_p == "f" } { +if { $archive_p eq "f" } { set where [db_map archive_where_clause] } else { set where [db_map no_archive_where_clause] Index: openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl 4 Sep 2002 13:01:46 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl 7 Sep 2013 12:50:57 -0000 1.3 @@ -15,8 +15,8 @@ form_vars:onevalue } -if { $confirmed == "t" } { - if { [empty_string_p $subtopic_name] || +if { $confirmed eq "t" } { + if { $subtopic_name eq "" || [regexp {[^a-zA-Z0-9\-_]} $subtopic_name] } { ad_return_complaint 1 "The subtopic name must be a short identifier containing no spaces. It will be the final part of the URL that Index: openacs-4/packages/edit-this-page/www/etp-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-create.tcl 6 Sep 2011 14:37:45 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-create.tcl 7 Sep 2013 12:50:58 -0000 1.5 @@ -15,7 +15,7 @@ set auto_page_name [etp::get_application_param auto_page_name] -if {$auto_page_name == "number"} { +if {$auto_page_name eq "number"} { set new_page_name [db_nextval etp_auto_page_number_seq] } elseif {$auto_page_name =="date"} { set new_page_name [ns_fmttime [ns_time] "%Y%m%d"] Index: openacs-4/packages/edit-this-page/www/etp-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/www/etp-delete.tcl 24 Sep 2001 17:24:13 -0000 1.1 +++ openacs-4/packages/edit-this-page/www/etp-delete.tcl 7 Sep 2013 12:50:58 -0000 1.2 @@ -19,7 +19,7 @@ set package_id [ad_conn package_id] -if { $confirmed == "t" } { +if { $confirmed eq "t" } { # TODO: the clear_revisions statement below should be unnecessary. # It's there because content_item__delete was throwing an error # (possibly due to the data-change violation, basically a postgresql bug) Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/edit-this-page/www/etp-edit.tcl 13 Jan 2005 13:58:04 -0000 1.13 +++ openacs-4/packages/edit-this-page/www/etp-edit.tcl 7 Sep 2013 12:50:58 -0000 1.14 @@ -35,11 +35,11 @@ set element $attribute # see if a select-list callback function was specified -if { [info commands $default] != "" } { +if { [info commands $default] ne "" } { set query_results [eval $default option_list $attribute_id] set widget select -} elseif {$type == "string" && [regexp -nocase {(rows|cols)} $html]} { - if {[string equal $attribute content]} { +} elseif {$type eq "string" && [regexp -nocase {(rows|cols)} $html]} { + if {$attribute eq "content"} { set widget "(richtext)" @@ -48,7 +48,7 @@ set widget "(textarea)" } -} elseif {$type == "date"} { +} elseif {$type eq "date"} { set widget "(date),to_sql(linear_date),from_sql(sql_date)" set widget_extra [list format "Month DD YYYY"] set element datevalue @@ -61,7 +61,7 @@ set widget_list [list $element:${type}${widget} [list label "$attribute_title"] [list html $html] ] -if {[exists_and_not_null widget_extra]} { +if {([info exists widget_extra] && $widget_extra ne "")} { lappend widget_list $widget_extra } @@ -85,7 +85,7 @@ set attribute_id [etp::get_attribute_id $attribute_desc] db_1row get_extended_attribute "" } - if {[string equal $widget "(richtext)"]} { + if {$widget eq "(richtext)"} { set $element [template::util::richtext create $value $mime_type] } else { set $element $value @@ -104,7 +104,7 @@ db_1row get_extended_attribute "" } - if {[string equal $widget "(richtext)"]} { + if {$widget eq "(richtext)"} { set $element [template::util::richtext create $value $mime_type] } else { set $element $value @@ -119,7 +119,7 @@ # The date is given in YYYY-MM-DD. Transform to desired format. # set date_format [etp::get_application_param date_format] set value "[template::util::date::get_property year $datevalue]-[template::util::date::get_property month $datevalue]-[template::util::date::get_property day $datevalue]" - } elseif {[string equal $widget "(richtext)"]} { + } elseif {$widget eq "(richtext)"} { set value [template::util::richtext get_property contents [set $element]] set mime_type [template::util::richtext get_property format [set $element]] set extra_sql " , mime_type=:mime_type" @@ -162,7 +162,7 @@ # reflects the new title. Note this is something you can't do through # the Site Map UI. - if { $name == "index" && $attribute == "title" } { + if { $name eq "index" && $attribute eq "title" } { db_dml update_package_instance_name "" } @@ -172,7 +172,7 @@ set page_title [_ edit-this-page.atribute_for_page_title] -if {$name == "index"} { +if {$name eq "index"} { set context [list [list "etp?[export_url_vars name]" Edit] $attribute_title] } else { set context [list [list $name $name] [list "etp?[export_url_vars name]" Edit] $attribute_title] Index: openacs-4/packages/edit-this-page/www/etp-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-extlink.tcl 13 Jan 2005 13:58:04 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-extlink.tcl 7 Sep 2013 12:50:58 -0000 1.5 @@ -21,11 +21,11 @@ set package_id [ad_conn package_id] set user_id [ad_conn user_id] -if { $confirmed == "t" } { - if { [empty_string_p $url] || [empty_string_p $label] } { +if { $confirmed eq "t" } { + if { $url eq "" || $label eq "" } { ad_return_complaint 1 "[_ edit-this-page.You_must_fill_out_all_fields]" } else { - if { [empty_string_p $item_id] } { + if { $item_id eq "" } { db_exec_plsql create_extlink { } @@ -43,7 +43,7 @@ set confirmed "t" set form_vars [export_form_vars item_id confirmed] - if {![empty_string_p $item_id]} { + if {$item_id ne ""} { db_1row get_extlink_info { select url, label, description from cr_extlinks Index: openacs-4/packages/edit-this-page/www/etp-history.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-history.tcl 13 Jan 2005 13:58:04 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-history.tcl 7 Sep 2013 12:50:58 -0000 1.4 @@ -25,7 +25,7 @@ set page_title [_ edit-this-page.revision_history_for] -if {$name == "index"} { +if {$name eq "index"} { set context [list [list "etp?[export_url_vars name]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"] } else { set context [list [list $name $name] [list "etp?[export_url_vars name]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"] Index: openacs-4/packages/edit-this-page/www/etp-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-master.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-master.tcl 4 Sep 2002 13:01:46 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-master.tcl 7 Sep 2013 12:50:58 -0000 1.3 @@ -13,7 +13,7 @@ } set filename [file tail [ad_conn url]] -if { [string compare $filename "etp*"] != 0 } { +if { $filename ne "etp*" } { set etp_link [etp::get_etp_link] } else { set etp_link "" Index: openacs-4/packages/edit-this-page/www/etp-revert.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revert.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/www/etp-revert.tcl 24 Sep 2001 17:24:13 -0000 1.1 +++ openacs-4/packages/edit-this-page/www/etp-revert.tcl 7 Sep 2013 12:50:58 -0000 1.2 @@ -23,7 +23,7 @@ set package_id [ad_conn package_id] -if { $confirmed == "t" } { +if { $confirmed eq "t" } { db_transaction { db_1row get_item_id "" Index: openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl 4 Apr 2003 15:59:38 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl 7 Sep 2013 12:50:58 -0000 1.3 @@ -22,7 +22,7 @@ set package_id [ad_conn package_id] -if { [string equal $confirmed "t"] } { +if {$confirmed eq "t"} { db_exec_plsql delete_revision {} Index: openacs-4/packages/edit-this-page/www/etp-setup-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-setup-2.tcl 13 Mar 2005 00:13:21 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-setup-2.tcl 7 Sep 2013 12:50:58 -0000 1.5 @@ -18,7 +18,7 @@ set site_node_url [file dirname [ad_conn url]] -if { $site_node_url == "/" } { +if { $site_node_url eq "/" } { # -100 is the magic number for the "root folder". set folder_id -100 db_transaction { @@ -34,7 +34,7 @@ set parent_package_id $parent_site_node(object_id) # set parent_package_id [site_node_closest_ancestor_package -url "$parent_url" "edit-this-page"] -# if {[empty_string_p $parent_package_id]} { +# if {$parent_package_id eq ""} { # set parent_package_id [site_node_closest_ancestor_package -url "$parent_url" "acs-subsite"] # } Index: openacs-4/packages/edit-this-page/www/etp-setup.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-setup.tcl 13 Jan 2005 13:58:04 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-setup.tcl 7 Sep 2013 12:50:58 -0000 1.5 @@ -22,7 +22,7 @@ set package_id [ad_conn package_id] -if { $confirmed == "f" } { +if { $confirmed eq "f" } { set app [parameter::get -package_id $package_id -parameter application -default "default"] set subtopic_app [parameter::get -package_id $package_id -parameter subtopic_application -default "default"] Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl 13 Jan 2005 13:58:04 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl 7 Sep 2013 12:50:58 -0000 1.4 @@ -17,8 +17,8 @@ etp::check_write_access -if { $confirmed == "t" } { - if { [empty_string_p $subtopic_name] || +if { $confirmed eq "t" } { + if { $subtopic_name eq "" || [regexp {[^a-zA-Z0-9\-_]} $subtopic_name] } { ad_return_complaint 1 "[_ edit-this-page.The_subtopic_name_must_be_a_short_identifier]" } else { Index: openacs-4/packages/edit-this-page/www/etp-symlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-symlink.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-symlink.tcl 13 Jan 2005 13:58:04 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-symlink.tcl 7 Sep 2013 12:50:58 -0000 1.5 @@ -18,21 +18,21 @@ set package_id [ad_conn package_id] set user_id [ad_conn user_id] -if { ![empty_string_p $target_id] } { +if { $target_id ne "" } { # if the target is a folder, find the item_id for its index page if { [db_string get_object_type { select object_type from acs_objects where object_id = :target_id - }] == "content_folder" } { + }] eq "content_folder" } { set target_id [db_string get_index_id { select item_id from cr_items where parent_id = :target_id and name = 'index' }] } - if { [empty_string_p $item_id] } { + if { $item_id eq "" } { db_exec_plsql create_symlink { } } else { @@ -46,7 +46,7 @@ ad_script_abort } else { - if {![empty_string_p $item_id]} { + if {$item_id ne ""} { db_1row get_symlink_info { select target_id from cr_symlinks Index: openacs-4/packages/edit-this-page/www/etp-trash.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-trash.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-trash.tcl 9 Nov 2001 03:38:17 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-trash.tcl 7 Sep 2013 12:50:58 -0000 1.4 @@ -37,7 +37,7 @@ db_transaction { - if {![empty_string_p $node_id]} { + if {$node_id ne ""} { site_map_unmount_application -delete_p "t" $node_id } Index: openacs-4/packages/edit-this-page/www/etp.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/edit-this-page/www/etp.tcl 6 Sep 2013 15:27:55 -0000 1.8 +++ openacs-4/packages/edit-this-page/www/etp.tcl 7 Sep 2013 12:50:58 -0000 1.9 @@ -62,28 +62,28 @@ set page_title [_ edit-this-page.Attributes] -if { $name == "index" } { +if { $name eq "index" } { set context [list "[_ acs-kernel.common_Edit]"] } else { set context [list [list $name $pa(title)] "[_ acs-kernel.common_Edit]"] } set url_dir "[file dirname [ad_conn url]]" -if { $url_dir == "/" } { +if { $url_dir eq "/" } { set page_url "/$name" set edit_parent_url "" } else { set page_url "$url_dir/$name" - if { $name == "index" } { + if { $name eq "index" } { regsub {/[^/]*/[^/]*$} $page_url "" parent_url } else { set parent_url $url_dir } set edit_parent_url "$parent_url/etp" } -if {$name == "index"} { +if {$name eq "index"} { # Get the list of content items in this directory etp::get_content_items Index: openacs-4/packages/edit-this-page/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/index.vuh,v diff -u -r1.5 -r1.6 --- openacs-4/packages/edit-this-page/www/index.vuh 27 Jan 2005 21:38:32 -0000 1.5 +++ openacs-4/packages/edit-this-page/www/index.vuh 7 Sep 2013 12:50:58 -0000 1.6 @@ -20,13 +20,13 @@ #ns_log Notice "index.vuh: request for $name" -if { [string index $name end] == "/" } { +if { [string index $name end] eq "/" } { # it's in a subdirectory, and we know there's no # other package mounted on that subdirectory. ns_returnnotfound } -if {[empty_string_p $name] || $name == "index"} { +if {$name eq "" || $name eq "index"} { set path "/[etp::get_application_param index_template]" } elseif {[string match "etp*" $name]} { # this trickery is for serving pages from the top level,