Index: openacs-4/packages/dotlrn-homework/www/file-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-delete.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/dotlrn-homework/www/file-delete.tcl 7 Aug 2017 23:48:10 -0000 1.7 +++ openacs-4/packages/dotlrn-homework/www/file-delete.tcl 22 Oct 2023 16:45:21 -0000 1.7.2.1 @@ -6,7 +6,7 @@ @cvs-id $Id$ } { file_id:integer,notnull - {confirmed_p:boolean "f"} + {confirmed_p:boolean,notnull f} } -validate { valid_file -requires {file_id} { if {![fs_file_p $file_id]} { @@ -29,16 +29,16 @@ set user_id [ad_conn user_id] -set blocked_p [ad_decode [db_string blockers " -select count(*) -from cr_revisions -where item_id = :file_id -and acs_permission.permission_p(revision_id,:user_id,'delete') = 'f'"] 0 f t] +set blocked_p [ad_decode [db_string blockers { + select count(*) + from cr_revisions + where item_id = :file_id + and acs_permission.permission_p(revision_id,:user_id,'delete') = 'f'}] 0 f t] -if {$confirmed_p == "t" && $blocked_p == "f" } { +if {$confirmed_p && $blocked_p == "f" } { # they confirmed that they want to delete the file - db_1row parent_id "select parent_id from cr_items where item_id = :file_id" + db_1row parent_id {select parent_id from cr_items where item_id = :file_id} db_transaction { @@ -49,10 +49,10 @@ db_dml version_perms_delete {} - db_exec_plsql delete_file " + db_exec_plsql delete_file { begin file_storage.delete_file(:file_id); - end;" + end;} } @@ -64,7 +64,6 @@ db_1row file_name {} set title [dotlrn_homework::decode_name $title] - set context_bar [list [_ dotlrn-homework.Delete]] ad_return_template Index: openacs-4/packages/dotlrn-homework/www/file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn-homework/www/file.tcl 7 Aug 2017 23:48:10 -0000 1.8 +++ openacs-4/packages/dotlrn-homework/www/file.tcl 22 Oct 2023 16:45:21 -0000 1.8.2.1 @@ -12,7 +12,7 @@ } { file_id:integer,notnull folder_id:integer,notnull - {show_all_versions_p:boolean "f"} + {show_all_versions_p:boolean,notnull f} } -validate { valid_file -requires {file_id} { if {![fs_file_p $file_id]} { @@ -53,7 +53,7 @@ # idea so I'm not putting out a link to it. As of July Sloan agrees. set copy_url [export_vars -base file-copy {file_id name}] -if {$show_all_versions_p == "t"} { +if {$show_all_versions_p} { set show_versions [db_map show_all_versions] } else { set show_versions [db_map show_live_version] Index: openacs-4/packages/dotlrn-homework/www/folder-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-delete.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/dotlrn-homework/www/folder-delete.tcl 7 Aug 2017 23:48:10 -0000 1.6 +++ openacs-4/packages/dotlrn-homework/www/folder-delete.tcl 22 Oct 2023 16:45:21 -0000 1.6.2.1 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { folder_id:integer,notnull - {confirmed_p:boolean "f"} + {confirmed_p:boolean,notnull f} } -validate { valid_folder -requires {folder_id:integer} { if {![fs_folder_p $folder_id]} { @@ -31,7 +31,7 @@ permission::require_permission -object_id $folder_id -privilege delete -if {$confirmed_p == "t"} { +if {$confirmed_p} { # they have confirmed that they want to delete the folder db_1row parent_id {} db_exec_plsql folder_delete {} Index: openacs-4/packages/dotlrn-homework/www/version-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/version-delete.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/dotlrn-homework/www/version-delete.tcl 7 Aug 2017 23:48:10 -0000 1.8 +++ openacs-4/packages/dotlrn-homework/www/version-delete.tcl 22 Oct 2023 16:45:21 -0000 1.8.2.1 @@ -6,7 +6,7 @@ @cvs-id $Id$ } { version_id:integer,notnull - {confirmed_p:boolean "f"} + {confirmed_p:boolean,notnull f} } -validate { valid_version -requires {version_id} { if {![fs_version_p $version_id]} { @@ -24,12 +24,13 @@ permission::require_permission -object_id $version_id -privilege delete -db_1row item_select " -select item_id -from cr_revisions -where revision_id = :version_id" +db_1row item_select { + select item_id + from cr_revisions + where revision_id = :version_id +} -if {$confirmed_p == "t"} { +if {$confirmed_p} { # they have confirmed that they want to delete the version db_transaction { Index: openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl,v diff -u -r1.19 -r1.19.2.1 --- openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl 29 Jun 2018 17:27:18 -0000 1.19 +++ openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl 22 Oct 2023 16:55:20 -0000 1.19.2.1 @@ -5,10 +5,10 @@ @cvs-id $Id$ } { assessment_id:naturalnum,optional - {__new_p:boolean 0} - {permission_p:boolean 0} + {__new_p:boolean,notnull 0} + {permission_p:boolean,notnull 0} {type ""} - {after "0"} + {after:integer,notnull 0} } -properties { context:onevalue page_title:onevalue Index: openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl 29 Jun 2018 17:27:18 -0000 1.10 +++ openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl 22 Oct 2023 16:55:20 -0000 1.10.2.1 @@ -6,8 +6,8 @@ inter_item_check_id:naturalnum,multiple section_id:naturalnum,notnull assessment_id:naturalnum,notnull - by_item_p:boolean - item_id:naturalnum,optional + {by_item_p:boolean,notnull 0} + item_id:naturalnum,optional,notnull } permission::require_permission \ @@ -25,7 +25,7 @@ db_exec_plsql delete_check {} } } -if {$by_item_p == 1} { +if {$by_item_p} { ad_returnredirect "checks-admin?section_id=$section_id&assessment_id=$assessment_id&by_item_p=$by_item_p&item_id=$item_id" } else { ad_returnredirect "checks-admin?section_id=$section_id&assessment_id=$assessment_id&by_item_p=$by_item_p" Index: openacs-4/packages/assessment/www/asm-admin/section-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-form.tcl,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/assessment/www/asm-admin/section-form.tcl 29 Jun 2018 17:27:18 -0000 1.13 +++ openacs-4/packages/assessment/www/asm-admin/section-form.tcl 22 Oct 2023 16:55:20 -0000 1.13.2.1 @@ -6,8 +6,8 @@ } { assessment_id:naturalnum,notnull section_id:naturalnum,optional - {after:integer,optional 1} - {__new_p:boolean 0} + {after:integer,,notnull,optional 1} + {__new_p:boolean,notnull 0} } -properties { context:onevalue page_title:onevalue