Go back to API Browser.}] } - ad_return_warning "No such content page" [subst { - The file '$path' was not found. Maybe the url contains a typo. - $link - }] - return + ad_return_warning \ + "No such content page" \ + [subst { + The file '$path' was not found. Maybe the url contains a typo. + $link + }] + ad_script_abort } set mime_type [ns_guesstype $path] Index: openacs-4/packages/acs-api-browser/www/display-sql.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/display-sql.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-api-browser/www/display-sql.tcl 9 Jan 2018 13:33:13 -0000 1.7 +++ openacs-4/packages/acs-api-browser/www/display-sql.tcl 21 Jan 2018 01:13:57 -0000 1.8 @@ -41,7 +41,7 @@ } lappend context [file tail $url] -set title "[file tail $url]" +set title [file tail $url] # This is normally a password-protected page, but to be safe let's # check the incoming URL for ".." to make sure that someone isn't @@ -50,9 +50,10 @@ # for example if { [string match "*..*" $url] || [string match "*..*" $package_key] } { - ad_return_warning "Can't back up beyond the pageroot" "You can't use - display-sql.tcl to look at files underneath the pageroot." - return + ad_return_warning \ + "Can't back up beyond the pageroot" \ + "You can't use display-sql.tcl to look at files underneath the pageroot." + ad_script_abort } if { $package_key ne "" } { @@ -68,11 +69,17 @@ ad_try { set f [open $fn]; set sql [read $f]; close $f } on error {errorMsg} { - ad_return_warning "Problem reading file" "There was a problem reading $url ($errorMsg)" + ad_return_warning \ + "Problem reading file" \ + "There was a problem reading $url ($errorMsg)" + ad_script_abort } } } else { - ad_return_warning "Invalid file location" "Can only display files in package or doc directory" + ad_return_warning \ + "Invalid file location" \ + "Can only display files in package or doc directory" + ad_script_abort } # Local variables: Index: openacs-4/packages/acs-api-browser/www/procs-file-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/procs-file-view.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-api-browser/www/procs-file-view.tcl 7 Aug 2017 23:47:46 -0000 1.9 +++ openacs-4/packages/acs-api-browser/www/procs-file-view.tcl 21 Jan 2018 01:13:57 -0000 1.10 @@ -42,11 +42,13 @@ } else { set link [subst {
Go back to API Browser.}] } - ad_return_warning "No such library file" [subst { - The file '$path' was not found. Maybe the url contains a typo. - $link - }] - return + ad_return_warning \ + "No such library file" \ + [subst { + The file '$path' was not found. Maybe the url contains a typo. + $link + }] + ad_script_abort } Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v diff -u -r1.47 -r1.48 --- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 11 Aug 2017 12:54:40 -0000 1.47 +++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 21 Jan 2018 01:13:57 -0000 1.48 @@ -364,12 +364,11 @@ if { ![parameter::get -package_id $package_id -parameter SolicitPortraitP -default 1] } { if { ![acs_user::site_wide_admin_p] } { - ns_log notice "user is tried to see user/portrait/upload without permission" - ad_return_forbidden \ - "Permission Denied" \ - "
- You don't have permission to see this page. -" + ns_log notice "user is tried to see user/portrait/upload without permission" + ad_return_forbidden \ + "Permission Denied" \ + "
You don't have permission to see this page." + ad_script_abort } } } Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-subsite/www/shared/portrait.tcl 7 Aug 2017 23:47:59 -0000 1.11 +++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl 21 Jan 2018 01:13:57 -0000 1.12 @@ -23,8 +23,10 @@ from persons where person_id = :user_id }]} { - ad_return_warning "Account Unavailable" "We can't find user #$user_id in the users table." - return + ad_return_warning \ + "Account Unavailable" \ + "We can't find user #$user_id in the users table." + ad_script_abort } if {![db_0or1row get_item_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.11 -r1.12 --- openacs-4/packages/edit-this-page/www/etp.tcl 24 Sep 2015 07:32:15 -0000 1.11 +++ openacs-4/packages/edit-this-page/www/etp.tcl 21 Jan 2018 01:13:57 -0000 1.12 @@ -38,7 +38,10 @@ set revision_id [etp::get_latest_revision_id $package_id $name] if {![db_0or1row get_current_page_attributes "" -column_array pa]} { - ad_return_warning "Page $name does not exist" "No page by the name of $name exists" + ad_return_warning \ + "Page $name does not exist" \ + "No page by the name of $name exists" + ad_script_abort } template::multirow create page_attributes name pretty_name value