Index: openacs-4/packages/general-comments/general-comments.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/general-comments.info,v diff -u -r1.16.4.4 -r1.16.4.5 --- openacs-4/packages/general-comments/general-comments.info 25 Sep 2013 10:22:57 -0000 1.16.4.4 +++ openacs-4/packages/general-comments/general-comments.info 3 Oct 2013 08:41:28 -0000 1.16.4.5 @@ -8,7 +8,7 @@ t comments - + Dave Bauer Don Baccus Service to provide comment entry and display on objects. @@ -18,7 +18,7 @@ GPL 2 - + Index: openacs-4/packages/general-comments/tcl/general-comments-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs.tcl,v diff -u -r1.20.8.1 -r1.20.8.2 --- openacs-4/packages/general-comments/tcl/general-comments-procs.tcl 9 Sep 2013 16:44:27 -0000 1.20.8.1 +++ openacs-4/packages/general-comments/tcl/general-comments-procs.tcl 3 Oct 2013 08:41:28 -0000 1.20.8.2 @@ -48,7 +48,7 @@ # created comment. This is done here to ensure that # a fail on permissions granting will not leave # the comment with incorrect permissions. - if {![empty_string_p $user_id]} { + if {$user_id ne ""} { permission::grant -object_id $comment_id \ -party_id $user_id \ -privilege "read" @@ -96,7 +96,7 @@ # get the package url set package_url [general_comments_package_url] - if { [empty_string_p $package_url] } { + if { $package_url eq "" } { return "" } @@ -138,7 +138,7 @@ set content_select [db_map content_select] ;# ", r.content" } - if { ![empty_string_p $context_id] } { + if { $context_id ne "" } { set context_clause "and o.context_id = :context_id" } else { set context_clause "" @@ -209,7 +209,7 @@ and r.revision_id = i.live_revision" { append attachments_html "
  • $title " - if { $mime_type == "image_gif" || $mime_type == "image/jpeg" } { + if { $mime_type eq "image_gif" || $mime_type eq "image/jpeg" } { append attachments_html "($name)\n" } else { append attachments_html "($name)\n" @@ -222,7 +222,7 @@ where i.parent_id = :comment_id and e.extlink_id = i.item_id" { append attachments_html "
  • $label\n" } - if { ![empty_string_p $attachments_html] } { + if { $attachments_html ne "" } { append html "
    [_ general-comments.Attachments]
    \n
      \n$attachments_html
    \n" } } @@ -263,7 +263,7 @@ } { # get the package url set package_url [general_comments_package_url] - if { [empty_string_p $package_url] } { + if { $package_url eq "" } { return "" } Index: openacs-4/packages/general-comments/www/comment-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add-2.tcl,v diff -u -r1.6.20.1 -r1.6.20.2 --- openacs-4/packages/general-comments/www/comment-add-2.tcl 6 Sep 2013 16:01:49 -0000 1.6.20.1 +++ openacs-4/packages/general-comments/www/comment-add-2.tcl 3 Oct 2013 08:41:28 -0000 1.6.20.2 @@ -35,7 +35,7 @@ # ad_page_contract does not set object_name to # [acs_object_name $object_id] if object_name is passed # in as an empty string. -if { [empty_string_p $object_name] } { +if { $object_name eq "" } { set object_name [acs_object_name $object_id] } Index: openacs-4/packages/general-comments/www/comment-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add-3.tcl,v diff -u -r1.9.8.2 -r1.9.8.3 --- openacs-4/packages/general-comments/www/comment-add-3.tcl 6 Sep 2013 17:37:19 -0000 1.9.8.2 +++ openacs-4/packages/general-comments/www/comment-add-3.tcl 3 Oct 2013 08:41:29 -0000 1.9.8.3 @@ -47,7 +47,7 @@ -category $category \ -content $content -if { [string equal $attach_p "f"] && ![empty_string_p $return_url] } { +if { $attach_p eq "f" && $return_url ne "" } { ad_returnredirect $return_url } else { ad_returnredirect "view-comment?[export_vars { comment_id return_url }]" Index: openacs-4/packages/general-comments/www/comment-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add.tcl,v diff -u -r1.5.20.1 -r1.5.20.2 --- openacs-4/packages/general-comments/www/comment-add.tcl 6 Sep 2013 16:01:49 -0000 1.5.20.1 +++ openacs-4/packages/general-comments/www/comment-add.tcl 3 Oct 2013 08:41:29 -0000 1.5.20.2 @@ -33,7 +33,7 @@ # ad_page_contract does not set object_name to # [acs_object_name $object_id] if object_name is passed # in as an empty string. -if { [empty_string_p $object_name] } { +if { $object_name eq "" } { set object_name [acs_object_name $object_id] } Index: openacs-4/packages/general-comments/www/comment-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit.tcl,v diff -u -r1.5.20.1 -r1.5.20.2 --- openacs-4/packages/general-comments/www/comment-edit.tcl 6 Sep 2013 16:01:49 -0000 1.5.20.1 +++ openacs-4/packages/general-comments/www/comment-edit.tcl 3 Oct 2013 08:41:29 -0000 1.5.20.2 @@ -30,7 +30,7 @@ # if revision_id is not passed in, assume that the user # wishes to edit the latest revision -if { [empty_string_p $revision_id] } { +if { $revision_id eq "" } { set revision_id [db_string get_latest_revision \ "select content_item.get_latest_revision(:comment_id) from dual"] } Index: openacs-4/packages/general-comments/www/delete-attachment-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment-2.tcl,v diff -u -r1.5.8.2 -r1.5.8.3 --- openacs-4/packages/general-comments/www/delete-attachment-2.tcl 9 Sep 2013 16:44:27 -0000 1.5.8.2 +++ openacs-4/packages/general-comments/www/delete-attachment-2.tcl 3 Oct 2013 08:41:29 -0000 1.5.8.3 @@ -26,7 +26,7 @@ # is released #Commented out during i18n convertion, Steffen -#if { $submit == "Proceed" } { +#if { $submit eq "Proceed" } { # get the type of the attachment @@ -35,15 +35,15 @@ from cr_items where item_id = :attach_id } - if { $content_type == "content_revision" } { + if { $content_type eq "content_revision" } { # get the mime_type db_1row get_mime_type { select mime_type from cr_revisions where item_id = :attach_id and revision_id = content_item.get_latest_revision (:attach_id) } - if { $mime_type == "image/jpeg" || $mime_type == "image/gif" } { + if { $mime_type eq "image/jpeg" || $mime_type eq "image/gif" } { # delete row from images table, we should only have one row # this is only temporary until CR provides a delete image function db_dml delete_image_row { @@ -62,7 +62,7 @@ end; } } - } elseif { $content_type == "content_extlink" } { + } elseif { $content_type eq "content_extlink" } { db_exec_plsql delete_extlink { begin content_extlink.del(:attach_id); Index: openacs-4/packages/general-comments/www/file-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-add-2.tcl,v diff -u -r1.6.14.3 -r1.6.14.4 --- openacs-4/packages/general-comments/www/file-add-2.tcl 9 Sep 2013 16:44:27 -0000 1.6.14.3 +++ openacs-4/packages/general-comments/www/file-add-2.tcl 3 Oct 2013 08:41:29 -0000 1.6.14.4 @@ -54,21 +54,21 @@ set guessed_file_type [cr_filename_to_mime_type -create $upload_file] # strip off the C:\directories... crud and just get the file name -if ![regexp {([^/\\]+)$} $upload_file match client_filename] { +if {![regexp {([^/\\]+)$} $upload_file match client_filename]} { # couldn't find a match set client_filename $upload_file } set what_aolserver_told_us "" -if { $file_extension == "jpeg" || $file_extension == "jpg" } { +if { $file_extension eq "jpeg" || $file_extension eq "jpg" } { catch { set what_aolserver_told_us [ns_jpegsize $tmp_filename] } -} elseif { $file_extension == "gif" } { +} elseif { $file_extension eq "gif" } { catch { set what_aolserver_told_us [ns_gifsize $tmp_filename] } } # the AOLserver jpegsize command has some bugs where the height comes # through as 1 or 2 -if { ![empty_string_p $what_aolserver_told_us] && [lindex $what_aolserver_told_us 0] > 10 && [lindex $what_aolserver_told_us 1] > 10 } { +if { $what_aolserver_told_us ne "" && [lindex $what_aolserver_told_us 0] > 10 && [lindex $what_aolserver_told_us 1] > 10 } { set original_width [lindex $what_aolserver_told_us 0] set original_height [lindex $what_aolserver_told_us 1] } else { @@ -81,7 +81,7 @@ set creation_ip [ad_conn peeraddr] set is_live "t" db_transaction { - if { $file_extension == "jpeg" || $file_extension == "jpg" || $file_extension == "gif" } { + if { $file_extension eq "jpeg" || $file_extension eq "jpg" || $file_extension eq "gif" } { db_exec_plsql insert_image { begin :1 := acs_message.new_image ( Index: openacs-4/packages/general-comments/www/view-comment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v diff -u -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/general-comments/www/view-comment.tcl 6 Sep 2013 17:37:20 -0000 1.9.2.3 +++ openacs-4/packages/general-comments/www/view-comment.tcl 3 Oct 2013 08:41:29 -0000 1.9.2.4 @@ -43,7 +43,7 @@ # if the user has write permissions then allow # viewing of selected revision if { $write_perm_p == 1 } { - if { [empty_string_p $revision_id] } { + if { $revision_id eq "" } { # get the latest revision set revision_id [db_string get_latest_revision { select content_item.get_latest_revision(:comment_id) from dual Index: openacs-4/packages/general-comments/www/admin/toggle-approval.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/toggle-approval.tcl,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/general-comments/www/admin/toggle-approval.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/admin/toggle-approval.tcl 3 Oct 2013 08:41:29 -0000 1.2.26.1 @@ -22,7 +22,7 @@ # if the user did not pass in a revision_id, then # assume that the user wishes to toggle the approval # state of the latest revision -if { [empty_string_p $revision_id] } { +if { $revision_id eq "" } { set revision_id [db_string get_latest_revision \ "select content_item.get_latest_revision(:comment_id) from dual"] }