Index: openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl 9 May 2018 15:33:31 -0000 1.26 +++ openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl 25 Jul 2018 02:09:22 -0000 1.27 @@ -956,9 +956,9 @@ # needs to be able to handle a null value if {![empty_string_p $dt(year)] || ![empty_string_p $dt(day)] || ![empty_string_p $dt(month)]} { if {[info exists dt(ampm)]} { - return "to_date('[DoubleApos "$dt(year)-[format %02u $dt(month)]-[format %02u $dt(day)] $dt(hour):$dt(minute):$dt(second) $dt(ampm)"]', 'YYYY-MM-DD HH12:MI:SS PM')" + return "to_date([ns_dbquotevalue "$dt(year)-[format %02u $dt(month)]-[format %02u $dt(day)] $dt(hour):$dt(minute):$dt(second) $dt(ampm)"], 'YYYY-MM-DD HH12:MI:SS PM')" } else { - return "to_date('[DoubleApos "$dt(year)-[format %02u $dt(month)]-[format %02u $dt(day)]"]', 'YYYY-MM-DD')" + return "to_date([ns_dbquotevalue "$dt(year)-[format %02u $dt(month)]-[format %02u $dt(day)]"], 'YYYY-MM-DD')" } } else { return "null" Index: openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl 25 Aug 2008 12:32:34 -0000 1.6 +++ openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl 25 Jul 2018 02:09:22 -0000 1.7 @@ -122,8 +122,7 @@ # " } elseif { $view_info_used == "all others" } { if { [llength $important_info_used_list] > 0 } { - set safe_important_info_used_list [DoubleApos $important_info_used_list] - set info_used_query_bit "and map.info_used not in ('[join $safe_important_info_used_list "', '"]')" + set info_used_query_bit "and map.info_used not in ([template::util::tcl_to_sql_list $important_info_used_list])" } else { set info_used_query_bit "" } Index: openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl 20 Aug 2008 20:34:33 -0000 1.7 +++ openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl 25 Jul 2018 02:09:22 -0000 1.8 @@ -46,8 +46,7 @@ # same query for issues that aren't in issue_type_list if { $issue_type_list_len > 0 } { # taking advantage of the fact that tcl lists are just strings - set safe_issue_type_list [DoubleApos $issue_type_list] - set last_bit_of_query "and 1 <= (select count(*) from ec_cs_issue_type_map map where map.issue_id=issues.issue_id and map.issue_type not in ('[join $safe_issue_type_list "', '"]'))" + set last_bit_of_query "and 1 <= (select count(*) from ec_cs_issue_type_map map where map.issue_id=issues.issue_id and map.issue_type not in ([template::util::tcl_to_sql_list $issue_type_list]))" } else { set last_bit_of_query "and 1 <= (select count(*) from ec_cs_issue_type_map map where map.issue_id=issues.issue_id)" } Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl 25 Aug 2008 12:47:54 -0000 1.10 +++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl 25 Jul 2018 02:09:22 -0000 1.11 @@ -188,7 +188,7 @@ set additional_and_clause "and user_identification_id not in ([join $already_selected_user_identification_id_list ", "])" } if { ![empty_string_p $other_id_info] } { - set sql "select user_identification_id as d_user_identification_id from ec_user_identification where other_id_info like '%[DoubleApos $other_id_info]%' $additional_and_clause" + set sql "select user_identification_id as d_user_identification_id from ec_user_identification where other_id_info like [ns_dbquotevalue %${other_id_info}%] $additional_and_clause" db_foreach get_user_identification_info $sql { append customer_id_html "
  • This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary $d_user_identification_id "t"] (check here if this is correct).
    • " lappend already_selected_user_identification_id_list $d_user_identification_id Index: openacs-4/packages/ecommerce/www/admin/customer-service/issues.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issues.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/customer-service/issues.tcl 24 Aug 2008 21:35:36 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/customer-service/issues.tcl 25 Jul 2018 02:09:22 -0000 1.6 @@ -111,8 +111,7 @@ } elseif { $view_issue_type == "all others" } { if { [llength $important_issue_type_list] > 0 } { # taking advantage of the fact that tcl lists are just strings - set safe_important_issue_type_list [DoubleApos $important_issue_type_list] - set issue_type_query_bit "and m.issue_type not in ('[join $safe_important_issue_type_list "', '"]')" + set issue_type_query_bit "and m.issue_type not in ([template::util::tcl_to_sql_list $important_issue_type_list])" } else { set issue_type_query_bit "" } Index: openacs-4/packages/ecommerce/www/admin/customer-service/statistics.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/statistics.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/customer-service/statistics.tcl 24 Aug 2008 21:51:19 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/customer-service/statistics.tcl 25 Jul 2018 02:09:22 -0000 1.6 @@ -20,7 +20,7 @@ set issue_type_decode [db_map initial_issue_type_decode_bit] set issue_type_counter 0 foreach issue_type $important_issue_type_list { - #append issue_type_decode "'[DoubleApos $issue_type]',$issue_type_counter," + #append issue_type_decode "[::ns_dbquotevalue $issue_type],$issue_type_counter," append issue_type_decode [db_map middle_issue_type_decode_bit] incr issue_type_counter } @@ -82,7 +82,7 @@ set info_used_decode [db_map initial_info_used_decode_bit] set info_used_counter 0 foreach info_used $important_info_used_list { - #append info_used_decode "'[DoubleApos $info_used]',$info_used_counter," + #append info_used_decode "[::ns_dbquotevalue $info_used],$info_used_counter," append info_used_decode [db_map middle_info_used_decode_bit] incr info_used_counter } Index: openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 25 Jul 2018 02:09:22 -0000 1.5 @@ -47,7 +47,7 @@ if { [catch {db_dml unused "insert into ec_email_templates (email_template_id, title, subject, message, variables, when_sent, issue_type_list, last_modified, last_modifying_user, modified_ip_address) values -(ec_email_template_id_sequence.nextval, :title, :subject, :message, :variables, :when_sent, :issue_type, sysdate, :user_id, '[DoubleApos [ns_conn peeraddr]]')"} errMsg] } { +(ec_email_template_id_sequence.nextval, :title, :subject, :message, :variables, :when_sent, :issue_type, sysdate, :user_id, [ns_dbquotevalue [ns_conn peeraddr]])"} errMsg] } { ad_return_complaint 1 "Failed to add the email template, Suspect double click/ template already created" ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 25 Jul 2018 01:52:19 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 25 Jul 2018 02:09:22 -0000 1.6 @@ -57,7 +57,7 @@ issue_type_list=:issue_type, last_modified=sysdate, last_modifying_user=:user_id, - modified_ip_address='[DoubleApos [ns_conn peeraddr]]' + modified_ip_address=[ns_dbquotevalue [ns_conn peeraddr]] where email_template_id=:email_template_id"} errMsg ]} { ad_return_complaint 1 "Failed to update the email template." } Index: openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 25 Jul 2018 02:09:22 -0000 1.5 @@ -50,12 +50,12 @@ # we have to generate audit information set audit_fields "last_modified, last_modifying_user, modified_ip_address" -set audit_info "sysdate, :user_id, '[DoubleApos [ns_conn peeraddr]]'" +set audit_info "sysdate, :user_id, [ns_dbquotevalue [ns_conn peeraddr]]" db_dml insert_new_retailer "insert into ec_retailers (retailer_id, retailer_name, primary_contact_name, secondary_contact_name, primary_contact_info, secondary_contact_info, line1, line2, city, usps_abbrev, zip_code, phone, fax, url, country_code, reach, nexus_states, financing_policy, return_policy, price_guarantee_policy, delivery_policy, installation_policy, $audit_fields) values (:retailer_id, :retailer_name, :primary_contact_name, :secondary_contact_name, :primary_contact_info, :secondary_contact_info, :line1, :line2, :city, :usps_abbrev, :zip_code, :phone, :fax, :url, :country_code, :reach, :nexus_states, :financing_policy, :return_policy, :price_guarantee_policy, :delivery_policy, :installation_policy, $audit_info) " db_release_unused_handles -ad_returnredirect index.tcl \ No newline at end of file +ad_returnredirect index.tcl Index: openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 25 Jul 2018 02:09:22 -0000 1.5 @@ -70,7 +70,7 @@ ad_script_abort } -set audit_update "last_modified=sysdate, last_modifying_user=:user_id, modified_ip_address='[DoubleApos [ns_conn peeraddr]]'" +set audit_update "last_modified=sysdate, last_modifying_user=:user_id, modified_ip_address=[ns_dbquotevalue [ns_conn peeraddr]]" @@ -101,4 +101,4 @@ where retailer_id=:retailer_id " db_release_unused_handles -ad_returnredirect index.tcl \ No newline at end of file +ad_returnredirect index.tcl Index: openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 25 Jul 2018 02:09:22 -0000 1.5 @@ -58,7 +58,7 @@ db_dml insert_new_template "insert into ec_templates (template_id, template_name, template, last_modified, last_modifying_user, modified_ip_address) values -(:template_id, :template_name, :template, sysdate, :user_id, '[DoubleApos [ns_conn peeraddr]]')" +(:template_id, :template_name, :template, sysdate, :user_id, [ns_dbquotevalue [ns_conn peeraddr]])" db_release_unused_handles ad_returnredirect index Index: openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 25 Jul 2018 02:09:22 -0000 1.5 @@ -45,7 +45,7 @@ # we have to first remove all references to this template in ec_products and ec_category_template_map -db_dml delete_product_refs "update ec_products set template_id=null, last_modified=sysdate, last_modifying_user=:user_id, modified_ip_address='[DoubleApos [ns_conn peeraddr]]' where template_id=:template_id" +db_dml delete_product_refs "update ec_products set template_id=null, last_modified=sysdate, last_modifying_user=:user_id, modified_ip_address=[ns_dbquotevalue [ns_conn peeraddr]] where template_id=:template_id" db_dml delete_from_ec_template_map "delete from ec_category_template_map where template_id=:template_id" Index: openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 25 Jul 2018 02:09:22 -0000 1.5 @@ -37,7 +37,7 @@ db_dml insert_new_uc "insert into ec_user_classes (user_class_id, user_class_name, last_modified, last_modifying_user, modified_ip_address) values -(:user_class_id,:user_class_name, sysdate, :user_id, '[DoubleApos [ns_conn peeraddr]]') +(:user_class_id,:user_class_name, sysdate, :user_id, [ns_dbquotevalue [ns_conn peeraddr]]) " db_release_unused_handles ad_returnredirect index.tcl Index: openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 1 Mar 2005 00:01:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 25 Jul 2018 02:09:22 -0000 1.5 @@ -30,7 +30,7 @@ db_dml update_ec_class_map "update ec_user_class_user_map -set user_class_approved_p=[ec_decode $user_class_approved_p "t" "'f'" "'t'"], last_modified=sysdate, last_modifying_user=:admin_user_id, modified_ip_address='[DoubleApos [ns_conn peeraddr]]' +set user_class_approved_p=[ec_decode $user_class_approved_p "t" "'f'" "'t'"], last_modified=sysdate, last_modifying_user=:admin_user_id, modified_ip_address=[ns_dbquotevalue [ns_conn peeraddr]] where user_id=:user_id and user_class_id=:user_class_id" db_release_unused_handles ad_returnredirect "members.tcl?[export_url_vars user_class_id]" Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 4 Sep 2008 12:24:06 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 25 Jul 2018 02:09:22 -0000 1.6 @@ -31,13 +31,13 @@ if { [db_string get_ucm_count "select count(*) from ec_user_class_user_map where user_id=:user_id and user_class_id=:user_class_id"] > 0 } { db_dml update_ec_user_class_map "update ec_user_class_user_map -set user_class_approved_p='t', last_modified=sysdate, last_modifying_user=:admin_user_id, modified_ip_address='[DoubleApos [ns_conn peeraddr]]' +set user_class_approved_p='t', last_modified=sysdate, last_modifying_user=:admin_user_id, modified_ip_address=[ns_dbquotevalue [ns_conn peeraddr]] where user_id=:user_id and user_class_id=:user_class_id" } else { db_dml insert_new_ucm_mapping "insert into ec_user_class_user_map (user_id, user_class_id, user_class_approved_p, last_modified, last_modifying_user, modified_ip_address) values -(:user_id, :user_class_id, 't', sysdate, :user_id, '[DoubleApos [ns_conn peeraddr]]') +(:user_id, :user_class_id, 't', sysdate, :user_id, [ns_dbquotevalue [ns_conn peeraddr]]) " } db_release_unused_handles Index: openacs-4/packages/cards/www/grade_task.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grade_task.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cards/www/grade_task.tcl 22 Jun 2006 13:00:54 -0000 1.1 +++ openacs-4/packages/cards/www/grade_task.tcl 25 Jul 2018 02:16:04 -0000 1.2 @@ -150,7 +150,7 @@ set new_grade 0.00 } if {[info exists grade($note_id)]} { - set new_comment [DoubleApos $note_comment($note_id)] + set new_comment $note_comment($note_id) } else { set new_comment "" } Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 7 Aug 2017 23:48:10 -0000 1.20 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 25 Jul 2018 02:16:04 -0000 1.21 @@ -182,7 +182,7 @@ if { ![info exists comments_gs($party_id)] } { set comments_gs($party_id) "" } else { - set comments_gs($party_id) [DoubleApos $comments_gs($party_id)] + set comments_gs($party_id) $comments_gs($party_id) } if { [info exists grades_gs($party_id)] && $grades_gs($party_id) ne "" } { @@ -215,7 +215,7 @@ if { ![info exists comments_wa($party_id)] } { set comments_wa($party_id) "" } else { - set comments_wa($party_id) [DoubleApos $comments_wa($party_id)] + set comments_wa($party_id) $comments_wa($party_id) } if { [info exists grades_wa($party_id)] && $grades_wa($party_id) ne "" } { @@ -226,9 +226,17 @@ set new_item_p 1 } set grades_wa($party_id) [expr ($grades_wa($party_id)*100)/[format %0.3f $max_grade]] - set revision_id [evaluation::new_evaluation -new_item_p $new_item_p -item_id $item_ids($party_id) -content_type evaluation_student_evals \ - -content_table evaluation_student_evals -content_id evaluation_id -description $comments_wa($party_id) \ - -show_student_p $show_student_wa($party_id) -grade $grades_wa($party_id) -task_item_id $task_item_id -party_id $party_id] + set revision_id [evaluation::new_evaluation \ + -new_item_p $new_item_p \ + -item_id $item_ids($party_id) \ + -content_type evaluation_student_evals \ + -content_table evaluation_student_evals \ + -content_id evaluation_id \ + -description $comments_wa($party_id) \ + -show_student_p $show_student_wa($party_id) \ + -grade $grades_wa($party_id) \ + -task_item_id $task_item_id \ + -party_id $party_id] content::item::set_live_revision -revision_id $revision_id # notify the user if suscribed @@ -242,7 +250,7 @@ if { ![info exists comments_na($party_id)] } { set comments_na($party_id) "" } else { - set comments_na($party_id) [DoubleApos $comments_na($party_id)] + set comments_na($party_id) $comments_na($party_id) } if { [info exists grades_na($party_id)] && $grades_na($party_id) ne "" } { # new file? Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v diff -u -r1.29 -r1.30 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 7 Aug 2017 23:48:10 -0000 1.29 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 25 Jul 2018 02:16:04 -0000 1.30 @@ -146,14 +146,14 @@ lappend elements edit \ [list label "" \ sub_class narrow \ - display_template {#evaluation.edit#} \ + display_template {#evaluation.edit#} \ link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id }]} \ link_html { title "[_ evaluation.Edit_evaluation_]" } \ ] lappend elements delete \ [list label {} \ sub_class narrow \ - display_template {#evaluation.delete# } \ + display_template {#evaluation.delete# } \ link_url_eval {[export_vars -base "evaluation-delete" { evaluation_id return_url task_id }]} \ link_html { title "[_ evaluation.Delete_evaluation_]" } \ ] @@ -260,8 +260,8 @@ display_template {@not_evaluated_wa.answer@} \ link_html { title "[_ evaluation.View_answer_]"}] lappend elements grade \ - [list label "[_ evaluation.Grade] <\/if>" \ - display_template {

    $max_grade max
    } ] + [list label "[_ evaluation.Grade] <\/if>" \ + display_template {

    $max_grade max
    } ] lappend elements comments \ [list label "[_ evaluation.Comments]" \ display_template { } \ @@ -351,8 +351,8 @@ } lappend elements grade \ - [list label "[_ evaluation.Grade] <\/if>" \ - display_template {

    $max_grade max.
    }] + [list label "[_ evaluation.Grade] <\/if>" \ + display_template {

    $max_grade max.
    }] lappend elements comments \ [list label "[_ evaluation.Comments]" \ display_template { } \ @@ -454,8 +454,8 @@ } lappend elements grade \ - [list label "[_ evaluation.Grade] <\/if>" \ - display_template {

    $max_grade max.
    }] + [list label "[_ evaluation.Grade] <\/if>" \ + display_template {

    $max_grade max.
    }] lappend elements comments \ [list label "[_ evaluation.Comments]" \ display_template { } \